admin-update refresh

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

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index a23cc739aaace8bf5497b49b38645a7bf2bccd81..4af4ef8870824b0b927ba89296d0573ea140ce45 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -359,7 +359,7 @@ without creating a headache on maintenance of the pathes.
        priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11650,6 +11650,7 @@ static netdev_tx_t ipw_prom_hard_start_x
+@@ -11649,6 +11649,7 @@ static netdev_tx_t ipw_prom_hard_start_x
        return NETDEV_TX_OK;
  }
  
@@ -367,7 +367,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ipw_prom_netdev_ops = {
        .ndo_open               = ipw_prom_open,
        .ndo_stop               = ipw_prom_stop,
-@@ -11658,6 +11659,7 @@ static const struct net_device_ops ipw_p
+@@ -11657,6 +11658,7 @@ static const struct net_device_ops ipw_p
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
  };
@@ -375,7 +375,7 @@ without creating a headache on maintenance of the pathes.
  
  static int ipw_prom_alloc(struct ipw_priv *priv)
  {
-@@ -11678,7 +11680,13 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11677,7 +11679,13 @@ static int ipw_prom_alloc(struct ipw_pri
        memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
  
        priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -389,7 +389,7 @@ without creating a headache on maintenance of the pathes.
  
        priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
        SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11706,6 +11714,7 @@ static void ipw_prom_free(struct ipw_pri
+@@ -11705,6 +11713,7 @@ static void ipw_prom_free(struct ipw_pri
  
  #endif
  
@@ -397,7 +397,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ipw_netdev_ops = {
        .ndo_init               = ipw_net_init,
        .ndo_open               = ipw_net_open,
-@@ -11716,6 +11725,7 @@ static const struct net_device_ops ipw_n
+@@ -11715,6 +11724,7 @@ static const struct net_device_ops ipw_n
        .ndo_change_mtu         = libipw_change_mtu,
        .ndo_validate_addr      = eth_validate_addr,
  };
@@ -405,7 +405,7 @@ without creating a headache on maintenance of the pathes.
  
  static int __devinit ipw_pci_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *ent)
-@@ -11817,7 +11827,15 @@ static int __devinit ipw_pci_probe(struc
+@@ -11816,7 +11826,15 @@ static int __devinit ipw_pci_probe(struc
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -436,7 +436,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/libertas/main.c
 +++ b/drivers/net/wireless/libertas/main.c
-@@ -885,6 +885,7 @@ static void lbs_free_adapter(struct lbs_
+@@ -886,6 +886,7 @@ static void lbs_free_adapter(struct lbs_
        lbs_deb_leave(LBS_DEB_MAIN);
  }
  
@@ -444,7 +444,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops lbs_netdev_ops = {
        .ndo_open               = lbs_dev_open,
        .ndo_stop               = lbs_eth_stop,
-@@ -895,6 +896,7 @@ static const struct net_device_ops lbs_n
+@@ -896,6 +897,7 @@ static const struct net_device_ops lbs_n
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_validate_addr      = eth_validate_addr,
  };
@@ -452,7 +452,7 @@ without creating a headache on maintenance of the pathes.
  
  /**
   * @brief This function adds the card. it will probe the
-@@ -940,7 +942,16 @@ struct lbs_private *lbs_add_card(void *c
+@@ -941,7 +943,16 @@ struct lbs_private *lbs_add_card(void *c
        wdev->netdev = dev;
        priv->dev = dev;
  
@@ -469,7 +469,7 @@ without creating a headache on maintenance of the pathes.
        dev->watchdog_timeo = 5 * HZ;
        dev->ethtool_ops = &lbs_ethtool_ops;
  #ifdef        WIRELESS_EXT
-@@ -1246,11 +1257,13 @@ out:
+@@ -1247,11 +1258,13 @@ out:
        lbs_deb_leave(LBS_DEB_MAIN);
  }
  
@@ -483,7 +483,7 @@ without creating a headache on maintenance of the pathes.
  
  static int lbs_add_rtap(struct lbs_private *priv)
  {
-@@ -1271,7 +1284,13 @@ static int lbs_add_rtap(struct lbs_priva
+@@ -1272,7 +1285,13 @@ static int lbs_add_rtap(struct lbs_priva
  
        memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);
        rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;

diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch
index 39ade6aed15a1744817d2a6cfc72023dfa8a0c1f..893cead70a1f397e2897491434e8860f03c92d12 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
-@@ -3232,7 +3232,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -3219,7 +3219,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 58dc92b23769b6d433c6da14475eaee454cb7664..95a9d8894d9f00a9d507153fd66c963a32a0057e 100644 (file)
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -16,7 +16,7 @@ files...
  };
  
  /* internal helper: get rdev and dev */
-@@ -4187,7 +4189,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4188,7 +4190,9 @@ static int nl80211_wiphy_netns(struct sk
  
        err = cfg80211_switch_netns(rdev, net);
   out_put_net:

diff --git a/patches/05-usb.patch b/patches/05-usb.patch
index d5c92c4ea98b918120efc4fbb5054a5644344271..9af10b1489034ee00e86b29228c219ca19ccc4fe 100644 (file)
--- a/patches/05-usb.patch
+++ b/patches/05-usb.patch
@@ -2,7 +2,7 @@ USB opt soft_unbid was added as of 2.6.27.
 
 --- a/drivers/net/wireless/p54/p54usb.c
 +++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1054,7 +1054,9 @@ static struct usb_driver p54u_driver = {
+@@ -1055,7 +1055,9 @@ static struct usb_driver p54u_driver = {
        .resume = p54u_resume,
        .reset_resume = p54u_resume,
  #endif /* CONFIG_PM */

diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index ab495a49b2c3d1ad1198a96c034842942dc11335..2ff2f27e4bd58240aaed27548785651b259ea444 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
-@@ -3689,10 +3689,10 @@ static void __devexit iwl_pci_remove(str
+@@ -3725,10 +3725,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 7aa4e8e4d0cfda6cb23dcecb8f10f6f67a083861..8bb5f0d0f36e94bc0564ed49a06eab5f4fdf0f6c 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -38,7 +38,7 @@ thread in process context as well.
                if (err) {
                        b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq);
                        goto out;
-@@ -4664,6 +4677,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -4663,6 +4676,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {

diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch
index 28f20ee0f0e96a2e023cfad4814629a78c2ec19b..5d5beaf0dde8e1e2b7a18f4c4f386241fdbe3b3c 100644 (file)
--- a/patches/19-kfifo.patch
+++ b/patches/19-kfifo.patch
@@ -17,7 +17,7 @@ not be backported easily with defines in the compat module.
        struct task_struct *main_thread;
 --- a/drivers/net/wireless/libertas/main.c
 +++ b/drivers/net/wireless/libertas/main.c
-@@ -859,8 +859,14 @@ static int lbs_init_adapter(struct lbs_p
+@@ -860,8 +860,14 @@ static int lbs_init_adapter(struct lbs_p
        priv->resp_len[0] = priv->resp_len[1] = 0;
  
        /* Create the event FIFO */
@@ -32,7 +32,7 @@ not be backported easily with defines in the compat module.
                lbs_pr_err("Out of memory allocating event FIFO buffer\n");
                goto out;
        }
-@@ -876,7 +882,12 @@ static void lbs_free_adapter(struct lbs_
+@@ -877,7 +883,12 @@ static void lbs_free_adapter(struct lbs_
        lbs_deb_enter(LBS_DEB_MAIN);
  
        lbs_free_cmd_buffer(priv);

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index 4485b9456645d6a6a2b180cf08f51d4669763dd6..8972d7f24cb1163c5f069e7bad8e10706bbac0c7 100644 (file)
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -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();
-@@ -2039,8 +2039,15 @@ void ieee80211_tx_pending(unsigned long 
+@@ -2033,8 +2037,15 @@ void ieee80211_tx_pending(unsigned long 
  
                if (skb_queue_empty(&local->pending[i]))
                        list_for_each_entry_rcu(sdata, &local->interfaces, list)