compat-wireless: run ./scripts/admin-update.sh refresh for 2010-06-03

Synchs up with linux-next tag next-20100603

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

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 74e6e6fb78216ba6ef7d39a3ca9d35956d0af3e6..2801012688db40a508a2183d6f8ba377c6b907b6 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
-@@ -3109,7 +3109,7 @@ static int rndis_wlan_bind(struct usbnet
+@@ -3131,7 +3131,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.
         */
@@ -201,7 +201,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
-@@ -11685,7 +11685,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11684,7 +11684,7 @@ 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;
@@ -210,7 +210,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);
-@@ -11824,7 +11824,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11823,7 +11823,7 @@ static int __devinit ipw_pci_probe(struc
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -221,7 +221,7 @@ without creating a headache on maintenance of the pathes.
        net_dev->wireless_handlers = &ipw_wx_handler_def;
 --- a/drivers/net/wireless/libertas/main.c
 +++ b/drivers/net/wireless/libertas/main.c
-@@ -942,7 +942,7 @@ struct lbs_private *lbs_add_card(void *c
+@@ -968,7 +968,7 @@ struct lbs_private *lbs_add_card(void *c
        wdev->netdev = dev;
        priv->dev = dev;
  
@@ -230,7 +230,7 @@ without creating a headache on maintenance of the pathes.
        dev->watchdog_timeo = 5 * HZ;
        dev->ethtool_ops = &lbs_ethtool_ops;
  #ifdef        WIRELESS_EXT
-@@ -1273,7 +1273,7 @@ static int lbs_add_rtap(struct lbs_priva
+@@ -1304,7 +1304,7 @@ static int lbs_add_rtap(struct lbs_priva
  
        memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);
        rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -331,7 +331,7 @@ without creating a headache on maintenance of the pathes.
        atl1e_set_ethtool_ops(netdev);
 --- a/drivers/net/atl1c/atl1c_main.c
 +++ b/drivers/net/atl1c/atl1c_main.c
-@@ -2554,7 +2554,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2606,7 +2606,7 @@ static int atl1c_init_netdev(struct net_
        pci_set_drvdata(pdev, netdev);
  
        netdev->irq  = pdev->irq;

diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch
index 3409f1144a3ef44b73ad475ac29835b8d1b6c6fc..3c2765d01934581a82bd478ee60c5118b9ee0ae0 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
-@@ -2154,7 +2154,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -2150,7 +2150,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
  
        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
  

diff --git a/patches/05-usb.patch b/patches/05-usb.patch
index 47ac9dbaa290d9bd6184e2cee0a48ceff18cbedf..c61109644d15edd01b6a8512d5ff25fe4f60d4b1 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
-@@ -1055,7 +1055,9 @@ static struct usb_driver p54u_driver = {
+@@ -1054,7 +1054,9 @@ static struct usb_driver p54u_driver = {
        .resume = p54u_resume,
        .reset_resume = p54u_resume,
  #endif /* CONFIG_PM */
@@ -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
-@@ -1000,7 +1000,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -998,7 +998,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/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index dd6f2fb46d638711a7117723452b35ad8c66869b..76a5cd90cea3a7e88a368676f60b6777c6cffce5 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
-@@ -3910,10 +3910,10 @@ static void __devexit iwl_pci_remove(str
+@@ -3975,10 +3975,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/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index 8874bd19bf5e8029baa81404122b68ce7717333c..6fc24b242ce03028d49a7a0eca2a28a95d9c7769 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
-@@ -2611,7 +2611,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -2620,7 +2620,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch
index 168b92ec147a26e6a49b740a1e69e1565966bc7b..b9575991538c024b8f3eef64d8ed3429e3f1e8f6 100644 (file)
--- a/patches/19-kfifo.patch
+++ b/patches/19-kfifo.patch
@@ -3,7 +3,7 @@ not be backported easily with defines in the compat module.
 
 --- a/drivers/net/wireless/libertas/dev.h
 +++ b/drivers/net/wireless/libertas/dev.h
-@@ -119,7 +119,11 @@ struct lbs_private {
+@@ -125,7 +125,11 @@ struct lbs_private {
        u32 resp_len[2];
  
        /* Events sent from hardware to driver */
@@ -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
-@@ -861,8 +861,14 @@ static int lbs_init_adapter(struct lbs_p
+@@ -887,8 +887,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;
        }
-@@ -878,7 +884,12 @@ static void lbs_free_adapter(struct lbs_
+@@ -904,7 +910,12 @@ static void lbs_free_adapter(struct lbs_
        lbs_deb_enter(LBS_DEB_MAIN);
  
        lbs_free_cmd_buffer(priv);

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 6129e135bc4fac7f739d79fdf7a27cfb1a656af8..ad4edcbd32ca8dcb2d27424aa21e196331ddf3d1 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -13,7 +13,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
 
 --- a/drivers/net/atl1c/atl1c_main.c
 +++ b/drivers/net/atl1c/atl1c_main.c
-@@ -376,7 +376,11 @@ static void atl1c_set_multi(struct net_d
+@@ -407,7 +407,11 @@ static void atl1c_set_multi(struct net_d
  
        /* comoute mc addresses' hash value ,and put it into hash table */
        netdev_for_each_mc_addr(ha, netdev) {
@@ -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
-@@ -263,7 +263,11 @@ static void ath5k_remove_interface(struc
+@@ -262,7 +262,11 @@ static void ath5k_remove_interface(struc
                struct ieee80211_vif *vif);
  static int ath5k_config(struct ieee80211_hw *hw, u32 changed);
  static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw,
@@ -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,
-@@ -3107,20 +3111,42 @@ unlock:
+@@ -3104,20 +3108,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));
-@@ -3129,6 +3155,9 @@ static u64 ath5k_prepare_multicast(struc
+@@ -3126,6 +3152,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]); */
@@ -475,7 +475,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  static void rtl8187_configure_filter(struct ieee80211_hw *dev,
 --- a/drivers/net/wireless/wl12xx/wl1271_main.c
 +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
-@@ -1361,11 +1361,20 @@ struct wl1271_filter_params {
+@@ -1400,11 +1400,20 @@ struct wl1271_filter_params {
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
@@ -496,7 +496,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        struct wl1271 *wl = hw->priv;
  
        if (unlikely(wl->state == WL1271_STATE_OFF))
-@@ -1378,16 +1387,40 @@ static u64 wl1271_op_prepare_multicast(s
+@@ -1417,16 +1426,40 @@ static u64 wl1271_op_prepare_multicast(s
        }
  
        /* update multicast filtering parameters */

diff --git a/patches/27-hermes-read-pda-conflict.patch b/patches/27-hermes-read-pda-conflict.patch
index 43afdeef4bd4a85ab03fa0f57fb3a9f985108128..5f90791ecb61762126e77e13228ebf7f687863c7 100644 (file)
--- a/patches/27-hermes-read-pda-conflict.patch
+++ b/patches/27-hermes-read-pda-conflict.patch
@@ -45,7 +45,7 @@ define for something else in arch/um/include/asm/pda.h on older kernels.
        int (*program_end)(struct hermes *hw);
 --- a/drivers/net/wireless/orinoco/orinoco_usb.c
 +++ b/drivers/net/wireless/orinoco/orinoco_usb.c
-@@ -1551,7 +1551,7 @@ static const struct hermes_ops ezusb_ops
+@@ -1549,7 +1549,7 @@ static const struct hermes_ops ezusb_ops
        .read_ltv = ezusb_read_ltv,
        .write_ltv = ezusb_write_ltv,
        .bap_pread = ezusb_bap_pread,