compat-wireless: refresh patches

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index 5fb1a2806d60161fc946720da9ec35918f146318..4b17ca05bd19c5a4b26a9d875355c2d8d56de514 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
-@@ -3970,7 +3970,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4040,7 +4040,9 @@ static int nl80211_wiphy_netns(struct sk
        if (!net_eq(wiphy_net(&rdev->wiphy), net))
                err = cfg80211_switch_netns(rdev, net);
  
@@ -34,7 +34,7 @@ files...
  
  static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data)
  {
-@@ -377,7 +379,9 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -378,7 +380,9 @@ struct wiphy *wiphy_new(const struct cfg
        rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
  #endif
  
@@ -44,7 +44,7 @@ files...
  
        rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block;
        rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev),
-@@ -695,8 +699,10 @@ static int cfg80211_netdev_notifier_call
+@@ -696,8 +700,10 @@ static int cfg80211_netdev_notifier_call
                mutex_lock(&rdev->devlist_mtx);
                list_add_rcu(&wdev->list, &rdev->netdev_list);
                rdev->devlist_generation++;
@@ -55,7 +55,7 @@ files...
  
                if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
                                      "phy80211")) {
-@@ -841,6 +847,7 @@ static struct notifier_block cfg80211_ne
+@@ -852,6 +858,7 @@ static struct notifier_block cfg80211_ne
        .notifier_call = cfg80211_netdev_notifier_call,
  };
  
@@ -63,7 +63,7 @@ files...
  static void __net_exit cfg80211_pernet_exit(struct net *net)
  {
        struct cfg80211_registered_device *rdev;
-@@ -858,14 +865,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -869,14 +876,17 @@ static void __net_exit cfg80211_pernet_e
  static struct pernet_operations cfg80211_pernet_ops = {
        .exit = cfg80211_pernet_exit,
  };
@@ -81,7 +81,7 @@ files...
  
        err = wiphy_sysfs_init();
        if (err)
-@@ -900,8 +910,10 @@ out_fail_nl80211:
+@@ -911,8 +921,10 @@ out_fail_nl80211:
  out_fail_notifier:
        wiphy_sysfs_exit();
  out_fail_sysfs:
@@ -92,7 +92,7 @@ files...
        return err;
  }
  subsys_initcall(cfg80211_init);
-@@ -913,7 +925,9 @@ static void __exit cfg80211_exit(void)
+@@ -924,7 +936,9 @@ static void __exit cfg80211_exit(void)
        unregister_netdevice_notifier(&cfg80211_netdev_notifier);
        wiphy_sysfs_exit();
        regulatory_exit();

diff --git a/patches/05-usb.patch b/patches/05-usb.patch
index e028df20863eecf90de013bc2f949d7959253ac3..66f6d9842b81a3e6cb1fcc47e1437b1d542384af 100644 (file)
--- a/patches/05-usb.patch
+++ b/patches/05-usb.patch
@@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27.
  static int __init p54u_init(void)
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1068,7 +1068,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1066,7 +1066,9 @@ static struct usb_driver ath9k_hif_usb_d
        .reset_resume = ath9k_hif_usb_resume,
  #endif
        .id_table = ath9k_hif_usb_ids,

diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index 5fcc78464758d54938399d158b979d970d14440b..2de5767ee99fedb5ddc6fbcd1fc8742127658c36 100644 (file)
--- a/patches/08-rename-iwl4965-config.patch
+++ b/patches/08-rename-iwl4965-config.patch
@@ -39,7 +39,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -3971,7 +3971,7 @@ static int iwl_pci_probe(struct pci_dev
+@@ -3962,7 +3962,7 @@ static int iwl_pci_probe(struct pci_dev
  #ifdef CONFIG_IWL5000
                iwlagn_hw_ops.hw_scan = NULL;
  #endif
@@ -48,7 +48,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
                iwl4965_hw_ops.hw_scan = NULL;
  #endif
        }
-@@ -4343,10 +4343,10 @@ static void __devexit iwl_pci_remove(str
+@@ -4336,10 +4336,10 @@ static void __devexit iwl_pci_remove(str
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {

diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch
index cedd48439d4b83cbb769cfc866d36974f6db0634..41c58ba1a6fce182b1cb512a1e141bb203e703f5 100644 (file)
--- a/patches/10-add-wext-handlers-to-netdev.patch
+++ b/patches/10-add-wext-handlers-to-netdev.patch
@@ -18,7 +18,7 @@ CONFIG_WIRELESS_EXT in compat-wireless.
 
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -367,10 +367,6 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -368,10 +368,6 @@ struct wiphy *wiphy_new(const struct cfg
        INIT_LIST_HEAD(&rdev->bss_list);
        INIT_WORK(&rdev->scan_done_wk, __cfg80211_scan_done);
  
@@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-wireless.
        device_initialize(&rdev->wiphy.dev);
        rdev->wiphy.dev.class = &ieee80211_class;
        rdev->wiphy.dev.platform_data = rdev;
-@@ -712,6 +708,15 @@ static int cfg80211_netdev_notifier_call
+@@ -713,6 +709,15 @@ static int cfg80211_netdev_notifier_call
                wdev->sme_state = CFG80211_SME_IDLE;
                mutex_unlock(&rdev->devlist_mtx);
  #ifdef CONFIG_CFG80211_WEXT

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 73a7550ab6e0d387ecc85e4685bb1daee0a14851..5800f2e282210ee2cc292ec40df9948131ccfe70 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@ calls on compat code with only slight modifications.
 
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -300,14 +300,36 @@ static int ath_pci_resume(struct device
+@@ -312,14 +312,36 @@ static int ath_pci_resume(struct device
        return 0;
  }
  
@@ -54,7 +54,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS  (&ath9k_pm_ops)
  
-@@ -325,7 +347,12 @@ static struct pci_driver ath_pci_driver
+@@ -337,7 +359,12 @@ static struct pci_driver ath_pci_driver
        .id_table   = ath_pci_id_table,
        .probe      = ath_pci_probe,
        .remove     = ath_pci_remove,
@@ -69,7 +69,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -4502,7 +4502,12 @@ static struct pci_driver iwl_driver = {
+@@ -4495,7 +4495,12 @@ static struct pci_driver iwl_driver = {
        .id_table = iwl_hw_card_ids,
        .probe = iwl_pci_probe,
        .remove = __devexit_p(iwl_pci_remove),
@@ -84,7 +84,7 @@ calls on compat code with only slight modifications.
  static int __init iwl_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-core.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
-@@ -2094,14 +2094,42 @@ int iwl_pci_resume(struct device *device
+@@ -2081,14 +2081,42 @@ int iwl_pci_resume(struct device *device
  }
  EXPORT_SYMBOL(iwl_pci_resume);
  
@@ -137,7 +137,7 @@ calls on compat code with only slight modifications.
  #endif /* CONFIG_PM */
 --- a/drivers/net/wireless/iwlwifi/iwl-core.h
 +++ b/drivers/net/wireless/iwlwifi/iwl-core.h
-@@ -633,7 +633,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
+@@ -631,7 +631,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
  #ifdef CONFIG_PM
  int iwl_pci_suspend(struct device *device);
  int iwl_pci_resume(struct device *device);
@@ -152,7 +152,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
 +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
-@@ -4272,7 +4272,12 @@ static struct pci_driver iwl3945_driver
+@@ -4270,7 +4270,12 @@ static struct pci_driver iwl3945_driver
        .id_table = iwl3945_hw_card_ids,
        .probe = iwl3945_pci_probe,
        .remove = __devexit_p(iwl3945_pci_remove),

diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index fe495205d1e0fb372c20669809a021f1d6c2bf10..11f6136e037db9e30040736fec1ebe6b0ebcdae9 100644 (file)
--- a/patches/14-device-type.patch
+++ b/patches/14-device-type.patch
@@ -8,7 +8,7 @@ compile warning.
 
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -656,9 +656,11 @@ static void wdev_cleanup_work(struct wor
+@@ -657,9 +657,11 @@ static void wdev_cleanup_work(struct wor
        dev_put(wdev->netdev);
  }
  
@@ -36,7 +36,7 @@ compile warning.
  {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1256,13 +1256,17 @@ static const struct net_device_ops usbne
+@@ -1273,13 +1273,17 @@ static const struct net_device_ops usbne
  
  // precondition: never called in_interrupt
  

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index e3af27684a9fa6fc05d6640b11e593d61e1ecc6e..6dbb0c13ca4a8a462afc15fc647be9cd36bf7046 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
-@@ -2895,7 +2895,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -2896,7 +2896,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch
index 84260f6a7f98404ba8150d9f37c44318918a8c87..732f525917a499dc9a4d1e611b8386303ea5a2a9 100644 (file)
--- a/patches/17-netdev-queue.patch
+++ b/patches/17-netdev-queue.patch
@@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was:
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1252,6 +1252,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -1220,6 +1220,7 @@ void ieee80211_if_remove(struct ieee8021
   * Remove all interfaces, may only be called at hardware unregistration
   * time because it doesn't do RCU-safe list removals.
   */
@@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was:
  void ieee80211_remove_interfaces(struct ieee80211_local *local)
  {
        struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1268,6 +1269,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1236,6 +1237,22 @@ void ieee80211_remove_interfaces(struct
        mutex_unlock(&local->iflist_mtx);
        unregister_netdevice_many(&unreg_list);
  }

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index 366b5da4906ef643444514ae139a8536b19a41d2..88de16b0c7697879d72ddae7e41b85ab82c64030 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
-@@ -1637,6 +1637,10 @@ static void ieee80211_xmit(struct ieee80
+@@ -1638,6 +1638,10 @@ static void ieee80211_xmit(struct ieee80
                                return;
                        }
  
@@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
        ieee80211_set_qos_hdr(local, skb);
        ieee80211_tx(sdata, skb, false);
        rcu_read_unlock();
-@@ -2109,7 +2113,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2110,7 +2114,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 be524954a67879e39b08821062bee97f266317a2..f023114efa33ff87b765c58f4072c5dd46ec7f73 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/drivers/net/wireless/ath/ath5k/base.c
 +++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -3099,20 +3099,42 @@ unlock:
+@@ -3119,20 +3119,42 @@ unlock:
  }
  
  static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
@@ -205,7 +205,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
                pos &= 0x3f;
                mfilt[pos / 32] |= (1 << (pos % 32));
-@@ -3121,6 +3143,9 @@ static u64 ath5k_prepare_multicast(struc
+@@ -3141,6 +3163,9 @@ static u64 ath5k_prepare_multicast(struc
                * neet to inform below to not reset the mcast */
                /* ath5k_hw_set_mcast_filterindex(ah,
                 *      ha->addr[5]); */
@@ -677,7 +677,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -730,7 +730,12 @@ struct ieee80211_local {
+@@ -718,7 +718,12 @@ struct ieee80211_local {
        struct work_struct recalc_smps;
  
        /* aggregated multicast list */
@@ -692,7 +692,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -443,8 +443,13 @@ static void ieee80211_do_stop(struct iee
+@@ -433,8 +433,13 @@ static void ieee80211_do_stop(struct iee
  
        netif_addr_lock_bh(sdata->dev);
        spin_lock_bh(&local->filter_lock);
@@ -706,7 +706,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        spin_unlock_bh(&local->filter_lock);
        netif_addr_unlock_bh(sdata->dev);
  
-@@ -615,7 +620,12 @@ static void ieee80211_set_multicast_list
+@@ -593,7 +598,12 @@ static void ieee80211_set_multicast_list
                sdata->flags ^= IEEE80211_SDATA_PROMISC;
        }
        spin_lock_bh(&local->filter_lock);
@@ -733,7 +733,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        spin_unlock_bh(&local->filter_lock);
  
        /* be a bit nasty */
-@@ -547,9 +551,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -550,9 +554,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
        local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
  
        INIT_LIST_HEAD(&local->interfaces);

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index bdfb0ae201d34e40a84c144421f4c27aa654da87..9ea04bbd166c31fb3572f43f6c3a519ab6f14876 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
-@@ -1280,7 +1280,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -1281,7 +1281,7 @@ static int nl80211_valid_4addr(struct cf
                               enum nl80211_iftype iftype)
  {
        if (!use_4addr) {

diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch
index 2f52865cfaa56559d4694d16555b4b910e03be9d..91e23e30041411af7741206705f0fab06a1609df 100644 (file)
--- a/patches/31-backport-sk_add_backlog.patch
+++ b/patches/31-backport-sk_add_backlog.patch
@@ -9,7 +9,7 @@ backlog.
 
 --- a/net/bluetooth/l2cap.c
 +++ b/net/bluetooth/l2cap.c
-@@ -4412,8 +4412,12 @@ static inline int l2cap_data_channel(str
+@@ -4418,8 +4418,12 @@ static inline int l2cap_data_channel(str
                if (!sock_owned_by_user(sk)) {
                        l2cap_ertm_data_rcv(sk, skb);
                } else {

diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
index 584fafe68aa1ce9cb5f3421c02f755b22f758f55..dd962f97894addec87ba2322955ad51eea97e5df 100644 (file)
--- a/patches/36-workqueue.patch
+++ b/patches/36-workqueue.patch
@@ -2,7 +2,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
 
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -755,7 +755,11 @@ int ieee80211_register_hw(struct ieee802
+@@ -758,7 +758,11 @@ int ieee80211_register_hw(struct ieee802
                hw->queues = IEEE80211_MAX_QUEUES;
  
        local->workqueue =
@@ -14,7 +14,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
        if (!local->workqueue) {
                result = -ENOMEM;
                goto fail_workqueue;
-@@ -969,6 +973,10 @@ static void __exit ieee80211_exit(void)
+@@ -972,6 +976,10 @@ static void __exit ieee80211_exit(void)
        rc80211_minstrel_ht_exit();
        rc80211_minstrel_exit();