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

Refresh patch hunk offsets.

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

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 32afc2febaef00464bf31f3f31978e8213460200..144d20082db294732955a6f3c0534686c5ee5dbd 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -8,7 +8,7 @@ without creating a headache on maintenance of the pathes.
 
 --- a/drivers/net/usb/rndis_host.c
 +++ b/drivers/net/usb/rndis_host.c
-@@ -352,7 +352,11 @@ generic_rndis_bind(struct usbnet *dev, s
+@@ -346,7 +346,11 @@ generic_rndis_bind(struct usbnet *dev, s
        dev->rx_urb_size &= ~(dev->maxpacket - 1);
        u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);
  
@@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes.
        if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1328,7 +1328,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1331,7 +1331,7 @@ usbnet_probe (struct usb_interface *udev
                net->features |= NETIF_F_HIGHDMA;
  #endif
  
@@ -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
-@@ -3131,7 +3131,7 @@ static int rndis_wlan_bind(struct usbnet
+@@ -3137,7 +3137,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.
         */
@@ -292,7 +292,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/net/bluetooth/bnep/netdev.c
 +++ b/net/bluetooth/bnep/netdev.c
-@@ -168,8 +168,12 @@ static inline int bnep_net_proto_filter(
+@@ -170,8 +170,12 @@ static inline int bnep_net_proto_filter(
  }
  #endif
  
@@ -307,7 +307,7 @@ without creating a headache on maintenance of the pathes.
  {
        struct bnep_session *s = netdev_priv(dev);
        struct sock *sk = s->sock->sk;
-@@ -229,7 +233,7 @@ void bnep_net_setup(struct net_device *d
+@@ -231,7 +235,7 @@ void bnep_net_setup(struct net_device *d
        dev->addr_len = ETH_ALEN;
  
        ether_setup(dev);

diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch
index 2ddf967624294de404e66433996bb8c60934ceb8..8824d2761d4031321b19014391e99a76394b9f10 100644 (file)
--- a/patches/03-rfkill.patch
+++ b/patches/03-rfkill.patch
@@ -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
-@@ -2192,7 +2192,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -2191,7 +2191,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
  
        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
  

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index b73ea18d584837cc5b4e2e8cf957583c642e9fc1..49354e48112e676c0dbca6cf0f01bda23650241f 100644 (file)
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -16,7 +16,7 @@ files...
  };
  
  /* internal helper: get rdev and dev */
-@@ -4343,7 +4345,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4374,7 +4376,9 @@ static int nl80211_wiphy_netns(struct sk
  
        err = cfg80211_switch_netns(rdev, net);
   out_put_net:

diff --git a/patches/07-change-default-rate-alg.patch b/patches/07-change-default-rate-alg.patch
index cfc8280c38f49d82974403c9deb3e9e72ef26204..f0ccbce2fd45be9ddf80c28c133dc1b97d40469f 100644 (file)
--- a/patches/07-change-default-rate-alg.patch
+++ b/patches/07-change-default-rate-alg.patch
@@ -12,7 +12,7 @@ at compilation time.
 
 --- a/net/mac80211/rate.c
 +++ b/net/mac80211/rate.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ struct rate_control_alg {
  static LIST_HEAD(rate_ctrl_algs);
  static DEFINE_MUTEX(rate_ctrl_mutex);
  
@@ -21,7 +21,7 @@ at compilation time.
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
                 "Default rate control algorithm for mac80211 to use");
-@@ -119,8 +119,8 @@
+@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
                ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
  
        /* try built-in one if specific alg requested but not found */

diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index 681ff22f5c5ad763d9a4eaf23c25582b7bc49600..11cb536a9097e7f50507784a34d1cae451efe6eb 100644 (file)
--- a/patches/08-rename-iwl4965-config.patch
+++ b/patches/08-rename-iwl4965-config.patch
@@ -16,7 +16,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
-@@ -4079,10 +4079,10 @@ static void __devexit iwl_pci_remove(str
+@@ -4194,10 +4194,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/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch
index 423fede74bf1710fe4f2d0bad576f7d25ac7e715..c5f8fd2bbc91014176cf08351c875d2d5cd2076c 100644 (file)
--- a/patches/28-pm-qos-params.patch
+++ b/patches/28-pm-qos-params.patch
@@ -57,7 +57,7 @@ little wierd.
  
        /* We have to signal any supplicant if we are disassociating */
        if (associated)
-@@ -6665,8 +6686,16 @@ static int __init ipw2100_init(void)
+@@ -6669,8 +6686,16 @@ static int __init ipw2100_init(void)
        if (ret)
                goto out;
  
@@ -74,7 +74,7 @@ little wierd.
  #ifdef CONFIG_IPW2100_DEBUG
        ipw2100_debug_level = debug;
        ret = driver_create_file(&ipw2100_pci_driver.driver,
-@@ -6688,7 +6717,13 @@ static void __exit ipw2100_exit(void)
+@@ -6692,7 +6717,13 @@ static void __exit ipw2100_exit(void)
                           &driver_attr_debug_level);
  #endif
        pci_unregister_driver(&ipw2100_pci_driver);

diff --git a/patches/30-br-port-backport.patch b/patches/30-br-port-backport.patch
index bb2491e91d755a7d5dcabe0efcc43e3de177a23a..67f86eb1a2a654db83e8de4e3ae6ede4a512a503 100644 (file)
--- a/patches/30-br-port-backport.patch
+++ b/patches/30-br-port-backport.patch
@@ -3,7 +3,7 @@ attribute was replaced with a private flag.
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1109,7 +1109,11 @@ static int nl80211_valid_4addr(struct cf
+@@ -1140,7 +1140,11 @@ static int nl80211_valid_4addr(struct cf
                               enum nl80211_iftype iftype)
  {
        if (!use_4addr) {