compat-wireless: refresh patches

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 044df8e555deef5276fd82eb9408767753368913..f1bf028dba859356602577068e922792c0337479 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1175,7 +1175,7 @@ static const struct net_device_ops ath6k
+@@ -1201,7 +1201,7 @@ static const struct net_device_ops ath6k
  
  void init_netdev(struct net_device *dev)
  {
@@ -267,7 +267,7 @@ without creating a headache on maintenance of the pathes.
  #define LBS_DEB_LEAVE 0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1282,7 +1282,7 @@ static const struct net_device_ops hwsim
+@@ -1283,7 +1283,7 @@ static const struct net_device_ops hwsim
  
  static void hwsim_mon_setup(struct net_device *dev)
  {

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index a95d9ae97650500dd466fc8369178817658f1a1a..24030df70caf63597648706877f1bf5630d7a72c 100644 (file)
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5207,7 +5207,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5215,7 +5215,9 @@ static int nl80211_wiphy_netns(struct sk
        if (!net_eq(wiphy_net(&rdev->wiphy), net))
                err = cfg80211_switch_netns(rdev, net);
  

diff --git a/patches/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch
index 22b5a5ef9d4712f91e94296ae8bec72e8167724c..cbba23797e9c31ed41e13430b617eee812f8a65e 100644 (file)
--- a/patches/09-cfg80211-wext-padding.patch
+++ b/patches/09-cfg80211-wext-padding.patch
@@ -30,7 +30,7 @@ moved due to struct enlargements.
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2009,6 +2009,9 @@ struct wiphy_wowlan_support {
+@@ -2012,6 +2012,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
        /* assign these fields before you register the wiphy */
  

diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 33a51b64b6210c53a2744b76e86556f7eb3e89ee..709d42ddfd95d99cfb5954ee05892f9b770a23d1 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -6,7 +6,7 @@ thread in process context as well.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -4180,8 +4180,13 @@ redo:
+@@ -4193,8 +4193,13 @@ redo:
        if (b43_bus_host_is_sdio(dev->dev)) {
                b43_sdio_free_irq(dev);
        } else {
@@ -20,7 +20,7 @@ thread in process context as well.
        }
        mutex_lock(&wl->mutex);
        dev = wl->current_dev;
-@@ -4223,9 +4228,17 @@ static int b43_wireless_core_start(struc
+@@ -4236,9 +4241,17 @@ static int b43_wireless_core_start(struc
                        goto out;
                }
        } else {
@@ -38,7 +38,7 @@ thread in process context as well.
                if (err) {
                        b43err(dev->wl, "Cannot request IRQ-%d\n",
                               dev->dev->irq);
-@@ -5013,6 +5026,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5026,6 +5039,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {

diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch
index 6ee16bd9ed017f45080be91d3365b2c5630a7c8a..6f39f7a9d04af950899830705eceb5a5c0cab17a 100644 (file)
--- a/patches/12-mac80211-disable-tx-status.patch
+++ b/patches/12-mac80211-disable-tx-status.patch
@@ -6,7 +6,7 @@ So we need to just ifdef this part out.
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1949,6 +1949,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1955,6 +1955,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
                goto fail;
        }
  
@@ -14,7 +14,7 @@ So we need to just ifdef this part out.
        if (unlikely(!multicast && skb->sk &&
                     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
                struct sk_buff *orig_skb = skb;
-@@ -1987,6 +1988,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1993,6 +1994,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
                        skb = orig_skb;
                }
        }

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index a18cc2f66bfb9b5d61c4cb59c414b90f30c2af86..de8e676f7ed0e00dbdc34bdb7bf40041aadaf4ad 100644 (file)
--- a/patches/15-symbol-export-conflicts.patch
+++ b/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
 
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -3112,7 +3112,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3105,7 +3105,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 896bf0d36e29b9b4795336d0f0a618460d1daca0..f61aa761e41f7eb8448688f7333101703d35af9d 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -590,7 +590,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -530,7 +530,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -531,7 +531,14 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  
@@ -605,7 +605,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1058,8 +1065,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1059,8 +1066,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -618,7 +618,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -1071,7 +1082,11 @@ static int l2cap_sock_create(struct net
+@@ -1072,7 +1083,11 @@ static int l2cap_sock_create(struct net
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index bf12c4b8aa551193fe3edfb541a4cb3fba2b766f..54926d9ec3855093d92769d7050fb1b7422fb4a8 100644 (file)
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
  
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1469,6 +1469,10 @@ void ieee80211_xmit(struct ieee80211_sub
+@@ -1475,6 +1475,10 @@ void ieee80211_xmit(struct ieee80211_sub
                                return;
                        }
  
@@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
        ieee80211_set_qos_hdr(sdata, skb);
        ieee80211_tx(sdata, skb, false);
        rcu_read_unlock();
-@@ -2204,7 +2208,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2210,7 +2214,14 @@ void ieee80211_tx_pending(unsigned long
  
                if (skb_queue_empty(&local->pending[i]))
                        list_for_each_entry_rcu(sdata, &local->interfaces, list)

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 549644cc51929e451d6f0dfebecf1ff22e7b9af8..3dbb663b3cbc7ddb65e9aa67f17fdb2c72759d6a 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -651,8 +651,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        }
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2190,7 +2190,11 @@ struct ieee80211_ops {
-                              enum ieee80211_tx_sync_type type);
+@@ -2150,7 +2150,11 @@ struct ieee80211_ops {
+                                u32 changed);
  
        u64 (*prepare_multicast)(struct ieee80211_hw *hw,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
@@ -681,7 +681,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                }
 --- a/net/mac80211/driver-ops.h
 +++ b/net/mac80211/driver-ops.h
-@@ -204,14 +204,28 @@ static inline void drv_finish_tx_sync(st
+@@ -169,14 +169,28 @@ static inline void drv_bss_info_changed(
  }
  
  static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
@@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -849,7 +849,12 @@ struct ieee80211_local {
+@@ -848,7 +848,12 @@ struct ieee80211_local {
        struct work_struct recalc_smps;
  
        /* aggregated multicast list */

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index 19414e3be6744c50a1aaadd1cf5961e3d6be2fe0..8869dca0f37025612b672b64606c1a1fa79de6fa 100644 (file)
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -5,7 +5,7 @@ suspend and resume that are not backported.
 
 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
 +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
-@@ -2152,7 +2152,7 @@ int ath6kl_cfg80211_resume(struct ath6kl
+@@ -2240,7 +2240,7 @@ int ath6kl_cfg80211_resume(struct ath6kl
  }
  EXPORT_SYMBOL(ath6kl_cfg80211_resume);
  
@@ -14,7 +14,7 @@ suspend and resume that are not backported.
  
  /* hif layer decides what suspend mode to use */
  static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy,
-@@ -2790,7 +2790,7 @@ static struct cfg80211_ops ath6kl_cfg802
+@@ -2951,7 +2951,7 @@ static struct cfg80211_ops ath6kl_cfg802
        .del_pmksa = ath6kl_del_pmksa,
        .flush_pmksa = ath6kl_flush_pmksa,
        CFG80211_TESTMODE_CMD(ath6kl_tm_cmd)
@@ -25,7 +25,7 @@ suspend and resume that are not backported.
  #endif
 --- a/drivers/net/wireless/ath/ath6kl/hif-ops.h
 +++ b/drivers/net/wireless/ath/ath6kl/hif-ops.h
-@@ -83,6 +83,7 @@ static inline void ath6kl_hif_cleanup_sc
+@@ -84,6 +84,7 @@ static inline void ath6kl_hif_cleanup_sc
        return ar->hif_ops->cleanup_scatter(ar);
  }
  
@@ -33,7 +33,7 @@ suspend and resume that are not backported.
  static inline int ath6kl_hif_suspend(struct ath6kl *ar,
                                     struct cfg80211_wowlan *wow)
  {
-@@ -90,6 +91,7 @@ static inline int ath6kl_hif_suspend(str
+@@ -91,6 +92,7 @@ static inline int ath6kl_hif_suspend(str
  
        return ar->hif_ops->suspend(ar, wow);
  }
@@ -41,7 +41,7 @@ suspend and resume that are not backported.
  
  /*
   * Read from the ATH6KL through its diagnostic window. No cooperation from
-@@ -121,12 +123,14 @@ static inline int ath6kl_hif_bmi_write(s
+@@ -122,12 +124,14 @@ static inline int ath6kl_hif_bmi_write(s
        return ar->hif_ops->bmi_write(ar, buf, len);
  }
  
@@ -58,7 +58,7 @@ suspend and resume that are not backported.
  {
 --- a/drivers/net/wireless/ath/ath6kl/sdio.c
 +++ b/drivers/net/wireless/ath/ath6kl/sdio.c
-@@ -808,6 +808,7 @@ static int ath6kl_set_sdio_pm_caps(struc
+@@ -836,6 +836,7 @@ static int ath6kl_set_sdio_pm_caps(struc
        return ret;
  }
  
@@ -66,7 +66,7 @@ suspend and resume that are not backported.
  static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
  {
        struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-@@ -909,6 +910,7 @@ static int ath6kl_sdio_resume(struct ath
+@@ -953,6 +954,7 @@ static int ath6kl_sdio_resume(struct ath
  
        return 0;
  }
@@ -74,7 +74,7 @@ suspend and resume that are not backported.
  
  /* set the window address register (using 4-byte register access ). */
  static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)
-@@ -1210,8 +1212,10 @@ static const struct ath6kl_hif_ops ath6k
+@@ -1254,8 +1256,10 @@ static const struct ath6kl_hif_ops ath6k
        .enable_scatter = ath6kl_sdio_enable_scatter,
        .scat_req_rw = ath6kl_sdio_async_rw_scatter,
        .cleanup_scatter = ath6kl_sdio_cleanup_scatter,
@@ -85,7 +85,7 @@ suspend and resume that are not backported.
        .diag_read32 = ath6kl_sdio_diag_read32,
        .diag_write32 = ath6kl_sdio_diag_write32,
        .bmi_read = ath6kl_sdio_bmi_read,
-@@ -1221,7 +1225,7 @@ static const struct ath6kl_hif_ops ath6k
+@@ -1265,7 +1269,7 @@ static const struct ath6kl_hif_ops ath6k
        .stop = ath6kl_sdio_stop,
  };
  
@@ -94,7 +94,7 @@ suspend and resume that are not backported.
  
  /*
   * Empty handlers so that mmc subsystem doesn't remove us entirely during
-@@ -1370,7 +1374,9 @@ static struct sdio_driver ath6kl_sdio_dr
+@@ -1415,7 +1419,9 @@ static struct sdio_driver ath6kl_sdio_dr
        .id_table = ath6kl_sdio_devices,
        .probe = ath6kl_sdio_probe,
        .remove = ath6kl_sdio_remove,

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index 601f77f5d0a46bdc30b4c1c898dae39bfeb309d8..6293157cbe5ed1da9b2c82f5f5e8981397d293b8 100644 (file)
--- a/patches/30-bridge-port.patch
+++ b/patches/30-bridge-port.patch
@@ -34,7 +34,7 @@ compat-wireless.
             ntype == NL80211_IFTYPE_P2P_CLIENT))
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1598,7 +1598,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -1599,7 +1599,7 @@ static int nl80211_valid_4addr(struct cf
                               enum nl80211_iftype iftype)
  {
        if (!use_4addr) {

diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch
index 5d6f3312b7683183499aaadefc06995735ff53d4..dbd04ae2eb5f2440f27fcb8f9ed5b9c9ea6b8c28 100644 (file)
--- a/patches/40-netdev-hw-features.patch
+++ b/patches/40-netdev-hw-features.patch
@@ -332,7 +332,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  #endif /* ATLX_C */
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1022,6 +1022,7 @@ static struct net_device_stats *ath6kl_g
+@@ -1048,6 +1048,7 @@ static struct net_device_stats *ath6kl_g
        return &vif->net_stats;
  }
  
@@ -340,7 +340,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static int ath6kl_set_features(struct net_device *dev,
                               netdev_features_t features)
  {
-@@ -1054,6 +1055,7 @@ static int ath6kl_set_features(struct ne
+@@ -1080,6 +1081,7 @@ static int ath6kl_set_features(struct ne
  
        return err;
  }
@@ -348,7 +348,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
  static void ath6kl_set_multicast_list(struct net_device *ndev)
  {
-@@ -1169,7 +1171,9 @@ static const struct net_device_ops ath6k
+@@ -1195,7 +1197,9 @@ static const struct net_device_ops ath6k
        .ndo_stop               = ath6kl_close,
        .ndo_start_xmit         = ath6kl_data_tx,
        .ndo_get_stats          = ath6kl_get_stats,

diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch
index 03b76ab53fdd8f910554560e821fb0c04d72cf47..7d6815ef7835584da015f5baa3468122907bfb47 100644 (file)
--- a/patches/42-netlink_seq.patch
+++ b/patches/42-netlink_seq.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -4217,7 +4217,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4218,7 +4218,9 @@ static int nl80211_dump_scan(struct sk_b
        spin_lock_bh(&rdev->bss_lock);
        cfg80211_bss_expire(rdev);
  

diff --git a/patches/48-use_skb_get_queue_mapping.patch b/patches/48-use_skb_get_queue_mapping.patch
index eab1d6d0dae5796f2902760b0567e7974643a001..811522691f164286e74dd37e4bdfac8745ecc697 100644 (file)
--- a/patches/48-use_skb_get_queue_mapping.patch
+++ b/patches/48-use_skb_get_queue_mapping.patch
@@ -4,7 +4,7 @@ function always returns something.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -3407,11 +3407,11 @@ static void b43_op_tx(struct ieee80211_h
+@@ -3419,11 +3419,11 @@ static void b43_op_tx(struct ieee80211_h
        }
        B43_WARN_ON(skb_shinfo(skb)->nr_frags);
  
@@ -21,7 +21,7 @@ function always returns something.
  
 --- a/drivers/net/wireless/b43legacy/main.c
 +++ b/drivers/net/wireless/b43legacy/main.c
-@@ -2493,11 +2493,11 @@ static void b43legacy_op_tx(struct ieee8
+@@ -2503,11 +2503,11 @@ static void b43legacy_op_tx(struct ieee8
        }
        B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags);