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 669d1467701926b3a661a34f48d00915252bb544..c1833e3f3ef9a02e237677f5a448665dca84077a 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
-@@ -2164,7 +2164,7 @@ static int __devinit b44_init_one(struct
+@@ -2163,7 +2163,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/05-usb.patch b/patches/05-usb.patch
index 52baeb2a41e2a712861c2e0fffbc6b91444a7a2d..e028df20863eecf90de013bc2f949d7959253ac3 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
-@@ -1071,7 +1071,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1068,7 +1068,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/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index c7cc651a9bc73b3e957d1e544cfdd0ec82e51a93..73a7550ab6e0d387ecc85e4685bb1daee0a14851 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -167,7 +167,7 @@ calls on compat code with only slight modifications.
  static int __init iwl3945_init(void)
 --- a/drivers/net/wireless/ath/ath5k/pci.c
 +++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -285,6 +285,34 @@
+@@ -285,6 +285,34 @@ static int ath5k_pci_resume(struct devic
        return 0;
  }
  
@@ -202,7 +202,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
  #define ATH5K_PM_OPS  (&ath5k_pm_ops)
  #else
-@@ -296,7 +324,12 @@
+@@ -296,7 +324,12 @@ static struct pci_driver ath5k_pci_drive
        .id_table       = ath5k_pci_id_table,
        .probe          = ath5k_pci_probe,
        .remove         = __devexit_p(ath5k_pci_remove),

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 1b8c00d537c83e647f62c6c87dc7a9991640aa79..78a71ca15d7f33dca9b513959be47abb2bfc543b 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -99,7 +99,7 @@ here still, but for now we keep this here.
  #include <asm/system.h>
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -561,7 +561,11 @@ drop:
+@@ -566,7 +566,11 @@ drop:
        goto done;
  }
  
@@ -111,7 +111,7 @@ here still, but for now we keep this here.
  {
        struct hci_ufilter uf = { .opcode = 0 };
        struct sock *sk = sock->sk;
-@@ -716,8 +720,12 @@ static struct proto hci_sk_proto = {
+@@ -721,8 +725,12 @@ static struct proto hci_sk_proto = {
        .obj_size       = sizeof(struct hci_pinfo)
  };
  
@@ -450,7 +450,7 @@ here still, but for now we keep this here.
        struct bt_security sec;
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -729,8 +729,12 @@ static int rfcomm_tty_open(struct tty_st
+@@ -733,8 +733,12 @@ static int rfcomm_tty_open(struct tty_st
        remove_wait_queue(&dev->wait, &wait);
  
        if (err == 0)
@@ -463,7 +463,7 @@ here still, but for now we keep this here.
  
        rfcomm_tty_copy_pending(dev);
  
-@@ -750,7 +754,11 @@ static void rfcomm_tty_close(struct tty_
+@@ -754,7 +758,11 @@ static void rfcomm_tty_close(struct tty_
  
        if (atomic_dec_and_test(&dev->opened)) {
                if (dev->tty_dev->parent)
@@ -477,7 +477,7 @@ here still, but for now we keep this here.
                rfcomm_dlc_close(dev->dlc, 0);
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
-@@ -428,8 +428,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -430,8 +430,12 @@ static struct sock *sco_sock_alloc(struc
        return sk;
  }
  
@@ -490,7 +490,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -644,7 +648,11 @@ static int sco_sock_sendmsg(struct kiocb
+@@ -647,7 +651,11 @@ static int sco_sock_sendmsg(struct kiocb
        return err;
  }
  

diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch
index f04e708c215f5f36858334c28ca3f7ca7a49d9b7..9614d7815628c63902816a5851c76e094ffc2dec 100644 (file)
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -1385,7 +1385,7 @@
        .suspend        = spectrum_cs_suspend,
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -489,7 +489,11 @@ static int ssb_devices_register(struct s
+@@ -519,7 +519,11 @@ static int ssb_devices_register(struct s
                        break;
                case SSB_BUSTYPE_PCMCIA:
  #ifdef CONFIG_SSB_PCMCIAHOST

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 29eabd33ef3f074b9be0d2bb1d3f15342898d02e..be524954a67879e39b08821062bee97f266317a2 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
-@@ -1689,7 +1689,11 @@ static int __b44_load_mcast(struct b44 *
+@@ -1688,7 +1688,11 @@ static int __b44_load_mcast(struct b44 *
        netdev_for_each_mc_addr(ha, dev) {
                if (i == num_ents)
                        break;
@@ -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
-@@ -2948,20 +2948,42 @@ unlock:
+@@ -3099,20 +3099,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));
-@@ -2970,6 +2992,9 @@ static u64 ath5k_prepare_multicast(struc
+@@ -3121,6 +3143,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]); */

diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch
index c7bc3c72549ba7b59771b02468233eec979de799..2f52865cfaa56559d4694d16555b4b910e03be9d 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
-@@ -4413,8 +4413,12 @@ static inline int l2cap_data_channel(str
+@@ -4412,8 +4412,12 @@ static inline int l2cap_data_channel(str
                if (!sock_owned_by_user(sk)) {
                        l2cap_ertm_data_rcv(sk, skb);
                } else {