compat-wireless: refresh patches

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

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index b81715bf7c32c08da9f321cee422ba9cd4a893db..a62571b2fb3d91c5184625664ec00d59e5958714 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -107,7 +107,7 @@ without creating a headache on maintenance of the pathes.
                ieee80211_sdata_set_mesh_id(sdata,
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -2155,7 +2155,7 @@ static int __devinit b44_init_one(struct
+@@ -2164,7 +2164,7 @@ static int __devinit b44_init_one(struct
        bp->rx_pending = B44_DEF_RX_RING_PENDING;
        bp->tx_pending = B44_DEF_TX_RING_PENDING;
  

diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch
index c59d72b8fbe81b0c7924fbc58163c417fc44d29c..423acc966642bf61f6cb4bec673ef1f050b58f5a 100644 (file)
--- a/patches/03-rfkill.patch
+++ b/patches/03-rfkill.patch
@@ -146,7 +146,7 @@ This would do the policing from within mac80211.
        .unlocked_ioctl = rfkill_fop_ioctl,
        .compat_ioctl   = rfkill_fop_ioctl,
  #endif
-@@ -1267,7 +1267,7 @@ static int __init rfkill_init(void)
+@@ -1268,7 +1268,7 @@ static int __init rfkill_init(void)
                goto out;
        }
  
@@ -155,7 +155,7 @@ This would do the policing from within mac80211.
        error = rfkill_handler_init();
        if (error) {
                misc_deregister(&rfkill_miscdev);
-@@ -1283,7 +1283,7 @@ subsys_initcall(rfkill_init);
+@@ -1284,7 +1284,7 @@ subsys_initcall(rfkill_init);
  
  static void __exit rfkill_exit(void)
  {
@@ -208,7 +208,7 @@ This would do the policing from within mac80211.
  #include <net/cfg80211.h>
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2197,7 +2197,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -2179,7 +2179,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
  
        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
  

diff --git a/patches/05-usb.patch b/patches/05-usb.patch
index a816cdfa835ac181e6f3f11cbdc7631907f2b39e..857fdb1c4d3c7794c40a24f362541722f804b513 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
-@@ -1040,7 +1040,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1058,7 +1058,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 7930bf3d01b63da31ba5d6a58b57ba2785ede87e..1b216bc9ad35d7b77b19d9422ca7aca48b459ba5 100644 (file)
--- a/patches/08-rename-iwl4965-config.patch
+++ b/patches/08-rename-iwl4965-config.patch
@@ -33,7 +33,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -4625,10 +4625,10 @@ static void __devexit iwl_pci_remove(str
+@@ -4638,10 +4638,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/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 80ad414f7df943a6e2d7fc29bb6872d36dd16f25..86c1ae129d16f4d3f4c3d6ec6c4b919ed82d4c86 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -63,7 +63,7 @@ thread in process context as well.
  /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
 --- a/drivers/net/wireless/rt2x00/rt2x00.h
 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -883,6 +883,9 @@ struct rt2x00_dev {
+@@ -884,6 +884,9 @@ struct rt2x00_dev {
         * and interrupt thread routine.
         */
        u32 irqvalue[2];

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 85e9b25eba812810685d4ba7926fcc234b433c68..5de951b1f88bcd6c6be6a9c569ca4d4575ca5fe9 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -68,7 +68,7 @@ here still, but for now we keep this here.
  
        skb_free_datagram(sk, skb);
  
-@@ -337,7 +349,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -336,7 +348,11 @@ int bt_sock_ioctl(struct socket *sock, u
                if (sk->sk_state == BT_LISTEN)
                        return -EINVAL;
  

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index a16357edea154adb3244c683c9fd56319b9235f2..981d68348847789d562f0872609cfb44a218d528 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
-@@ -1620,6 +1620,10 @@ static void ieee80211_xmit(struct ieee80
+@@ -1621,6 +1621,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();
-@@ -2092,7 +2096,14 @@ void ieee80211_tx_pending(unsigned long 
+@@ -2093,7 +2097,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 2869364bd6d2d5d802fc628aa786329cf6b1b08a..0f07b5c8eedf49de57749bad9161f75d3fda39f5 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -69,7 +69,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -1680,7 +1680,11 @@ static int __b44_load_mcast(struct b44 *
+@@ -1689,7 +1689,11 @@ static int __b44_load_mcast(struct b44 *
        netdev_for_each_mc_addr(ha, dev) {
                if (i == num_ents)
                        break;
@@ -693,7 +693,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        spin_unlock_bh(&local->filter_lock);
  
        /* be a bit nasty */
-@@ -521,9 +525,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -524,9 +528,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
        local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
  
        INIT_LIST_HEAD(&local->interfaces);