./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 0246e3bf691eb2376cb44f54afc9821ad984e0e9..92ff143d028fe5230480f789c3ea2f52ed1a5689 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -118,7 +118,7 @@ without creating a headache on maintenance of the pathes.
  
  static u16 ieee80211_monitor_select_queue(struct net_device *dev,
                                          struct sk_buff *skb)
-@@ -703,6 +705,7 @@ static u16 ieee80211_monitor_select_queu
+@@ -706,6 +708,7 @@ static u16 ieee80211_monitor_select_queu
        return ieee80211_downgrade_queue(local, skb);
  }
  
@@ -126,7 +126,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ieee80211_monitorif_ops = {
        .ndo_open               = ieee80211_open,
        .ndo_stop               = ieee80211_stop,
-@@ -713,14 +716,28 @@ static const struct net_device_ops ieee8
+@@ -716,14 +719,28 @@ static const struct net_device_ops ieee8
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_select_queue       = ieee80211_monitor_select_queue,
  };
@@ -155,7 +155,7 @@ without creating a headache on maintenance of the pathes.
  /*
   * Helper function to initialise an interface to a specific type.
   */
-@@ -732,7 +749,11 @@ static void ieee80211_setup_sdata(struct
+@@ -735,7 +752,11 @@ static void ieee80211_setup_sdata(struct
  
        /* and set some type-dependent values */
        sdata->vif.type = type;
@@ -167,7 +167,7 @@ without creating a headache on maintenance of the pathes.
        sdata->wdev.iftype = type;
  
        /* only monitor differs */
-@@ -755,7 +776,13 @@ static void ieee80211_setup_sdata(struct
+@@ -758,7 +779,13 @@ static void ieee80211_setup_sdata(struct
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -181,7 +181,7 @@ without creating a headache on maintenance of the pathes.
                sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
                                      MONITOR_FLAG_OTHER_BSS;
                break;
-@@ -824,6 +851,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -827,6 +854,8 @@ int ieee80211_if_add(struct ieee80211_lo
                return -ENOMEM;
        dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -190,7 +190,7 @@ without creating a headache on maintenance of the pathes.
        ndev->needed_headroom = local->tx_headroom +
                                4*6 /* four MAC addresses */
                                + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -832,6 +861,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -835,6 +864,7 @@ int ieee80211_if_add(struct ieee80211_lo
                                - ETH_HLEN /* ethernet hard_header_len */
                                + IEEE80211_ENCRYPT_HEADROOM;
        ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -198,7 +198,7 @@ without creating a headache on maintenance of the pathes.
  
        ret = dev_alloc_name(ndev, ndev->name);
        if (ret < 0)
-@@ -873,6 +903,10 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -880,6 +910,10 @@ int ieee80211_if_add(struct ieee80211_lo
        if (ret)
                goto fail;
  

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index 83163a4088e2328b8e1f1e657958cbe86a3ca679..b19178cc0aa7bb8fe807e88346265277bfbea2c9 100644 (file)
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -16,9 +16,7 @@ files...
  };
  
  /* internal helper: get rdev and dev */
---- a/net/wireless/nl80211.c   2010-01-13 11:07:31.000000000 -0800
-+++ b/net/wireless/nl80211.c   2010-01-13 11:16:23.000000000 -0800
-@@ -4187,7 +4187,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4206,7 +4208,9 @@ static int nl80211_wiphy_netns(struct sk
  
        err = cfg80211_switch_netns(rdev, net);
   out_put_net:
@@ -28,8 +26,8 @@ files...
   out:
        cfg80211_unlock_rdev(rdev);
   out_rtnl:
---- a/net/wireless/core.c      2010-01-13 11:07:31.000000000 -0800
-+++ b/net/wireless/core.c      2010-01-13 11:20:29.000000000 -0800
+--- a/net/wireless/core.c
++++ b/net/wireless/core.c
 @@ -228,6 +228,7 @@ int cfg80211_dev_rename(struct cfg80211_
        return 0;
  }
@@ -56,7 +54,7 @@ files...
  
        rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block;
        rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev),
-@@ -673,8 +677,10 @@ static int cfg80211_netdev_notifier_call
+@@ -672,8 +676,10 @@ static int cfg80211_netdev_notifier_call
                mutex_lock(&rdev->devlist_mtx);
                list_add(&wdev->list, &rdev->netdev_list);
                rdev->devlist_generation++;
@@ -67,7 +65,7 @@ files...
  
                if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
                                      "phy80211")) {
-@@ -810,6 +816,7 @@ static struct notifier_block cfg80211_ne
+@@ -805,6 +811,7 @@ static struct notifier_block cfg80211_ne
        .notifier_call = cfg80211_netdev_notifier_call,
  };
  
@@ -75,7 +73,7 @@ files...
  static void __net_exit cfg80211_pernet_exit(struct net *net)
  {
        struct cfg80211_registered_device *rdev;
-@@ -827,14 +834,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -822,14 +829,17 @@ static void __net_exit cfg80211_pernet_e
  static struct pernet_operations cfg80211_pernet_ops = {
        .exit = cfg80211_pernet_exit,
  };
@@ -93,7 +91,7 @@ files...
  
        err = wiphy_sysfs_init();
        if (err)
-@@ -869,8 +879,10 @@ out_fail_nl80211:
+@@ -864,8 +874,10 @@ out_fail_nl80211:
  out_fail_notifier:
        wiphy_sysfs_exit();
  out_fail_sysfs:
@@ -104,7 +102,7 @@ files...
        return err;
  }
  subsys_initcall(cfg80211_init);
-@@ -882,7 +894,9 @@ static void cfg80211_exit(void)
+@@ -877,7 +889,9 @@ static void cfg80211_exit(void)
        unregister_netdevice_notifier(&cfg80211_netdev_notifier);
        wiphy_sysfs_exit();
        regulatory_exit();
@@ -114,8 +112,8 @@ files...
        destroy_workqueue(cfg80211_wq);
  }
  module_exit(cfg80211_exit);
---- a/net/wireless/wext-core.c 2010-01-13 11:07:31.000000000 -0800
-+++ b/net/wireless/wext-core.c 2010-01-13 11:16:23.000000000 -0800
+--- a/net/wireless/wext-core.c
++++ b/net/wireless/wext-core.c
 @@ -399,7 +399,11 @@ static void wireless_nlevent_process(uns
  {
        struct sk_buff *skb;
@@ -128,8 +126,8 @@ files...
  }
  
  static DECLARE_TASKLET(wireless_nlevent_tasklet, wireless_nlevent_process, 0);
---- a/net/wireless/wext-proc.c 2010-01-13 11:21:38.000000000 -0800
-+++ b/net/wireless/wext-proc.c 2010-01-13 11:22:30.000000000 -0800
+--- a/net/wireless/wext-proc.c
++++ b/net/wireless/wext-proc.c
 @@ -98,7 +98,11 @@ static void *wireless_dev_seq_start(stru
                return SEQ_START_TOKEN;
  

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 4f23ecbf63f5adeafff61f4ad193f57213726d60..8c99993a9825b7585b4731d4df3660ccacd23dfc 100644 (file)
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -64,18 +64,9 @@ cases.
  
  /**
   * DOC: Key handling basics
-
-Every kernel release there are a few changes to headers
-made. Some code gets shifted around between headers or
-new headers are defined. This patch deals with such
-cases.
-
-This file also deals with enhancements with new kernel headers
-which older kernels would conflict with.
-
---- a/net/mac80211/main.c      2010-01-05 21:54:51.000000000 -0800
-+++ b/net/mac80211/main.c      2010-01-05 21:55:21.000000000 -0800
-@@ -22,7 +22,9 @@
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -20,7 +20,9 @@
  #include <linux/rtnetlink.h>
  #include <linux/bitmap.h>
  #include <linux/pm_qos_params.h>
@@ -85,8 +76,8 @@ which older kernels would conflict with.
  #include <net/cfg80211.h>
  
  #include "ieee80211_i.h"
---- a/net/mac80211/cfg.c       2010-01-05 21:59:44.000000000 -0800
-+++ b/net/mac80211/cfg.c       2010-01-05 22:00:16.000000000 -0800
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
 @@ -9,7 +9,9 @@
  #include <linux/ieee80211.h>
  #include <linux/nl80211.h>
@@ -97,8 +88,8 @@ which older kernels would conflict with.
  #include <linux/rcupdate.h>
  #include <net/cfg80211.h>
  #include "ieee80211_i.h"
---- a/net/mac80211/tx.c        2010-01-05 22:01:11.000000000 -0800
-+++ b/net/mac80211/tx.c        2010-01-05 22:01:28.000000000 -0800
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
 @@ -18,7 +18,9 @@
  #include <linux/etherdevice.h>
  #include <linux/bitmap.h>
@@ -109,10 +100,10 @@ which older kernels would conflict with.
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
  #include <net/mac80211.h>
---- a/net/mac80211/util.c      2010-01-05 22:02:59.000000000 -0800
-+++ b/net/mac80211/util.c      2010-01-05 22:03:30.000000000 -0800
-@@ -21,7 +21,9 @@
- #include <linux/wireless.h>
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -20,7 +20,9 @@
+ #include <linux/if_arp.h>
  #include <linux/bitmap.h>
  #include <linux/crc32.h>
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
@@ -121,8 +112,8 @@ which older kernels would conflict with.
  #include <net/cfg80211.h>
  #include <net/rtnetlink.h>
  
---- a/net/wireless/nl80211.c   2010-01-13 11:31:54.000000000 -0800
-+++ b/net/wireless/nl80211.c   2010-01-13 11:32:18.000000000 -0800
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
 @@ -14,7 +14,9 @@
  #include <linux/rtnetlink.h>
  #include <linux/netlink.h>

diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index 97ff50bbb059e6d3c80ad7b241e09a45c39ca76f..46e53a351c87aaa9793a1d7267a48abae4ef845f 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
-@@ -3767,10 +3767,10 @@ static void __devexit iwl_pci_remove(str
+@@ -3770,10 +3770,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 1ea5abbf6dfd94a6ea514e48143e94871704239c..1abb4452ee01a97263dd907b965916bb271f2428 100644 (file)
--- a/patches/10-add-wext-handlers-to-netdev.patch
+++ b/patches/10-add-wext-handlers-to-netdev.patch
@@ -13,7 +13,7 @@ the struct wiphy wireless handler.
 
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -683,6 +683,10 @@ static int cfg80211_netdev_notifier_call
+@@ -690,6 +690,10 @@ 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/13-trace.patch b/patches/13-trace.patch
index 5bf597b582972c50870c1ce63f4f74f6c5bb639e..7a4ddcc6b6f52b94a48bb3a5f44f9fa09079b55f 100644 (file)
--- a/patches/13-trace.patch
+++ b/patches/13-trace.patch
@@ -35,7 +35,7 @@ in or compat headers.
  #include <net/mac80211.h>
  #include "ieee80211_i.h"
  
-@@ -717,4 +719,6 @@ TRACE_EVENT(drv_flush,
+@@ -740,4 +742,6 @@ TRACE_EVENT(drv_flush,
  #define TRACE_INCLUDE_PATH .
  #undef TRACE_INCLUDE_FILE
  #define TRACE_INCLUDE_FILE driver-trace

diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index 5c4f4d7c4cca00fbb185086a07d5b594d8bfec79..fe0618a14ed7b1b31e4df476b12937c6f310793f 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
-@@ -635,9 +635,11 @@ static void wdev_cleanup_work(struct wor
+@@ -640,9 +640,11 @@ static void wdev_cleanup_work(struct wor
        dev_put(wdev->netdev);
  }
  

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index fac1f0d0a856506eb44542c58bcdf0e2908edc6d..1716afe239315cea8d15b8980f193dfeed362463 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
-@@ -2476,7 +2476,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -2488,7 +2488,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 8f711e48400d3d0471d2967041c2a20608951d09..74dd787128f82919fb8618cba4fd7a5304d6f903 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
-@@ -943,6 +943,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -950,6 +950,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;
-@@ -959,6 +960,22 @@ void ieee80211_remove_interfaces(struct 
+@@ -966,6 +967,22 @@ void ieee80211_remove_interfaces(struct 
        mutex_unlock(&local->iflist_mtx);
        unregister_netdevice_many(&unreg_list);
  }

diff --git a/patches/20-pcidev.patch b/patches/20-pcidev.patch
index b93ef338e12278b00152ff42865cf5e0c1908e6a..e28693e91a0f509a56e3527893ecfe9a13409b7e 100644 (file)
--- a/patches/20-pcidev.patch
+++ b/patches/20-pcidev.patch
@@ -2,8 +2,8 @@ Older kernels than 2.6.24 do not have the is_pcie member as part of
 the struct pci_dev, to help with that we use the compat-2.6.24.c supplied
 compat_is_pcie() when needed.
 
---- a/drivers/net/wireless/ath/ath9k/pci.c     2010-01-13 10:48:29.000000000 -0800
-+++ b/drivers/net/wireless/ath/ath9k/pci.c     2010-01-13 10:49:52.000000000 -0800
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
 @@ -88,7 +88,11 @@ static void ath_pci_bt_coex_prep(struct 
        struct pci_dev *pdev = to_pci_dev(sc->dev);
        u8 aspm;