compat-wireless: ./scripts/admin-update.sh refresh

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

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 970df0aa8cb65e32cdc422c1e62c5a5ee675b1d8..74e6e6fb78216ba6ef7d39a3ca9d35956d0af3e6 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/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
-@@ -3105,7 +3105,7 @@ static int rndis_wlan_bind(struct usbnet
+@@ -3109,7 +3109,7 @@ static int rndis_wlan_bind(struct usbnet
         * rndis_host wants to avoid all OID as much as possible
         * so do promisc/multicast handling in rndis_wlan.
         */

diff --git a/patches/05-usb.patch b/patches/05-usb.patch
index f3d5420171e54d6c326cb1c76ca4fe7a94648594..47ac9dbaa290d9bd6184e2cee0a48ceff18cbedf 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
-@@ -994,7 +994,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1000,7 +1000,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/16-bluetooth.patch b/patches/16-bluetooth.patch
index fa40f7871df74665d7eb6aeb4d26d2b040e53de1..39c2aa2cb50ad6e7b4faad4f06adfc8c37806798 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -498,7 +498,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
-@@ -429,8 +429,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -428,8 +428,12 @@ static struct sock *sco_sock_alloc(struc
        return sk;
  }
  
@@ -511,7 +511,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -645,7 +649,11 @@ static int sco_sock_sendmsg(struct kiocb
+@@ -644,7 +648,11 @@ static int sco_sock_sendmsg(struct kiocb
        return err;
  }
  
@@ -595,7 +595,7 @@ here still, but for now we keep this here.
                return -EPERM;
  
        sock->ops = &l2cap_sock_ops;
-@@ -1912,7 +1920,11 @@ static int l2cap_sock_setsockopt_old(str
+@@ -1910,7 +1918,11 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  

diff --git a/patches/20-pcidev.patch b/patches/20-pcidev.patch
index e892dcccd2f90dfee5710aa7a8faae3e17798812..cb7f1cabc8941e9c8ea1f8046c303ade5abfeb6e 100644 (file)
--- a/patches/20-pcidev.patch
+++ b/patches/20-pcidev.patch
@@ -4,7 +4,7 @@ compat_is_pcie() when needed.
 
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -80,7 +80,11 @@ static void ath_pci_bt_coex_prep(struct 
+@@ -79,7 +79,11 @@ static void ath_pci_bt_coex_prep(struct 
        struct pci_dev *pdev = to_pci_dev(sc->dev);
        u8 aspm;
  

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 1033c56bb33b7a1ef4a807f9de5370f762a17556..6129e135bc4fac7f739d79fdf7a27cfb1a656af8 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -174,7 +174,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  static void ath5k_configure_filter(struct ieee80211_hw *hw,
                unsigned int changed_flags,
                unsigned int *new_flags,
-@@ -3106,20 +3110,42 @@ unlock:
+@@ -3107,20 +3111,42 @@ unlock:
  }
  
  static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
@@ -217,7 +217,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
                pos &= 0x3f;
                mfilt[pos / 32] |= (1 << (pos % 32));
-@@ -3128,6 +3154,9 @@ static u64 ath5k_prepare_multicast(struc
+@@ -3129,6 +3155,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]); */
@@ -576,7 +576,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        return hash.low | ((u64)hash.high << 32);
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -1673,7 +1673,11 @@ struct ieee80211_ops {
+@@ -1675,7 +1675,11 @@ struct ieee80211_ops {
                                 struct ieee80211_bss_conf *info,
                                 u32 changed);
        u64 (*prepare_multicast)(struct ieee80211_hw *hw,