compat-drivers: refresh in synch with next-20120911

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch
index 6ae65a996a80e07b6eafef81ae4521b5c1adae14..a3dc91ac78cff11b9b12a941ec51f8cc2ec6ff2d 100644 (file)
--- a/patches/network/0001-netdev_ops.patch
+++ b/patches/network/0001-netdev_ops.patch
@@ -104,7 +104,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11691,7 +11691,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;
@@ -113,7 +113,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
        priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
        SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11829,7 +11829,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11822,7 +11822,7 @@ static int __devinit ipw_pci_probe(struc
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -223,7 +223,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -976,7 +976,7 @@ static void ieee80211_if_setup(struct ne
+@@ -978,7 +978,7 @@ static void ieee80211_if_setup(struct ne
  {
        ether_setup(dev);
        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -232,7 +232,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        dev->destructor = free_netdev;
  }
  
-@@ -1132,7 +1132,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1134,7 +1134,7 @@ static void ieee80211_setup_sdata(struct
  
        /* only monitor/p2p-device differ */
        if (sdata->dev) {
@@ -241,7 +241,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
                sdata->dev->type = ARPHRD_ETHER;
        }
  
-@@ -1166,7 +1166,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1168,7 +1168,7 @@ static void ieee80211_setup_sdata(struct
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;

diff --git a/patches/network/0002-net-misc.patch b/patches/network/0002-net-misc.patch
index 78dcbf11e7ed6f96faae6718e826dae69a83cfdf..4e109180061167e37d451d0ac446193bd1b925be 100644 (file)
--- a/patches/network/0002-net-misc.patch
+++ b/patches/network/0002-net-misc.patch
@@ -22,7 +22,7 @@ compile tested against older kernels.
         * For RX we handle drivers that zero-pad to end-of-packet.
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -977,6 +977,11 @@ static void ieee80211_if_setup(struct ne
+@@ -979,6 +979,11 @@ static void ieee80211_if_setup(struct ne
        ether_setup(dev);
        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
        netdev_attach_ops(dev, &ieee80211_dataif_ops);

diff --git a/patches/network/0003-netdev-needed_headroom_tailroom.patch b/patches/network/0003-netdev-needed_headroom_tailroom.patch
index 06bb61ebf666d5e2798aa61ec3e0968460f217ee..d020555db8cba8f7188847d057bb482a9aecc26d 100644 (file)
--- a/patches/network/0003-netdev-needed_headroom_tailroom.patch
+++ b/patches/network/0003-netdev-needed_headroom_tailroom.patch
@@ -4,7 +4,7 @@ could be used.
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1461,6 +1461,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1463,6 +1463,7 @@ int ieee80211_if_add(struct ieee80211_lo
                        return -ENOMEM;
                dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -12,7 +12,7 @@ could be used.
                ndev->needed_headroom = local->tx_headroom +
                                        4*6 /* four MAC addresses */
                                        + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1469,6 +1470,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1471,6 +1472,7 @@ int ieee80211_if_add(struct ieee80211_lo
                                        - ETH_HLEN /* ethernet hard_header_len */
                                        + IEEE80211_ENCRYPT_HEADROOM;
                ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;

diff --git a/patches/network/02-ksize.patch b/patches/network/02-ksize.patch
index e2ccc9b7d71fdb4cc397e97471c5b023229353c9..082387456af5f99f5ab1d83afcb1258dda06d546 100644 (file)
--- a/patches/network/02-ksize.patch
+++ b/patches/network/02-ksize.patch
@@ -12,7 +12,7 @@ of the situation.
 
 --- a/drivers/net/wireless/orinoco/wext.c
 +++ b/drivers/net/wireless/orinoco/wext.c
-@@ -30,8 +30,22 @@ static int orinoco_set_key(struct orinoc
+@@ -31,8 +31,22 @@ static int orinoco_set_key(struct orinoc
                           enum orinoco_alg alg, const u8 *key, int key_len,
                           const u8 *seq, int seq_len)
  {

diff --git a/patches/network/05-usb.patch b/patches/network/05-usb.patch
index 7f78c6ce36cf7dfa039661aa95a539045ff05cec..10b0962590757e441e76ca9da96dc2e8e982172a 100644 (file)
--- a/patches/network/05-usb.patch
+++ b/patches/network/05-usb.patch
@@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27.
  
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1357,7 +1357,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1368,7 +1368,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/network/09-cfg80211-wext-padding.patch b/patches/network/09-cfg80211-wext-padding.patch
index 27c7ed68dc3acf2a6c96638db096ccff70d624bd..6db2db89ad9ea8bea78a0b7a9fa3ec21c8aa785c 100644 (file)
--- a/patches/network/09-cfg80211-wext-padding.patch
+++ b/patches/network/09-cfg80211-wext-padding.patch
@@ -30,7 +30,7 @@ moved due to struct enlargements.
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2154,6 +2154,9 @@ struct wiphy_wowlan_support {
+@@ -2155,6 +2155,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
        /* assign these fields before you register the wiphy */
  

diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch
index 59fcdd86a0a2de591f19128837cf0242acf5d466..a4b6276df045faf44d1335546bf3e136e4de9369 100644 (file)
--- a/patches/network/16-bluetooth.patch
+++ b/patches/network/16-bluetooth.patch
@@ -27,7 +27,7 @@ here still, but for now we keep this here.
 +              err = n_tty_ioctl(tty, file, cmd, arg);
 +#endif
                break;
-       };
+       }
  
 --- a/net/bluetooth/af_bluetooth.c
 +++ b/net/bluetooth/af_bluetooth.c

diff --git a/patches/network/17-netdev-queue.patch b/patches/network/17-netdev-queue.patch
index 2dd37a318d825d1df22edc0cb110ac860ba159bc..ccff437cd945f7fd7f6063e506c28daff9aa8ef1 100644 (file)
--- a/patches/network/17-netdev-queue.patch
+++ b/patches/network/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
-@@ -1578,6 +1578,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1580,6 +1580,7 @@ void ieee80211_sdata_stop(struct ieee802
   * 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;
-@@ -1605,6 +1606,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1607,6 +1608,22 @@ void ieee80211_remove_interfaces(struct
                kfree(sdata);
        }
  }

diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch
index 541e9326cd47f75c1749170bb14fbc1b06b1a3d3..d8caa2c37f60b2e9f4ba388b640598972b748b9f 100644 (file)
--- a/patches/network/25-multicast-list_head.patch
+++ b/patches/network/25-multicast-list_head.patch
@@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -716,8 +716,13 @@ static void ieee80211_do_stop(struct iee
+@@ -718,8 +718,13 @@ static void ieee80211_do_stop(struct iee
        if (sdata->dev) {
                netif_addr_lock_bh(sdata->dev);
                spin_lock_bh(&local->filter_lock);
@@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                spin_unlock_bh(&local->filter_lock);
                netif_addr_unlock_bh(sdata->dev);
  
-@@ -888,7 +893,12 @@ static void ieee80211_set_multicast_list
+@@ -890,7 +895,12 @@ static void ieee80211_set_multicast_list
                sdata->flags ^= IEEE80211_SDATA_PROMISC;
        }
        spin_lock_bh(&local->filter_lock);

diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/network/29-sdio_no_suspend.patch
index 5f4c82ff53fe154e89ae02fee865a0c20042621c..9153d860d26d61861eab5c8ee31de5a163b347bc 100644 (file)
--- a/patches/network/29-sdio_no_suspend.patch
+++ b/patches/network/29-sdio_no_suspend.patch
@@ -133,7 +133,7 @@ suspend and resume that are not backported.
  
 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -71,7 +71,7 @@ static bool
+@@ -73,7 +73,7 @@ static bool
  brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)
  {
        bool is_err = false;
@@ -142,7 +142,7 @@ suspend and resume that are not backported.
        is_err = atomic_read(&sdiodev->suspend);
  #endif
        return is_err;
-@@ -80,7 +80,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_
+@@ -82,7 +82,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_
  static void
  brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq)
  {
@@ -151,7 +151,7 @@ suspend and resume that are not backported.
        int retry = 0;
        while (atomic_read(&sdiodev->suspend) && retry++ != 30)
                wait_event_timeout(*wq, false, HZ/100);
-@@ -565,7 +565,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -567,7 +567,7 @@ static void brcmf_ops_sdio_remove(struct
        }
  }
  
@@ -160,7 +160,7 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev)
  {
        mmc_pm_flag_t sdio_flags;
-@@ -615,7 +615,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -617,7 +617,7 @@ static struct sdio_driver brcmf_sdmmc_dr
        .remove = brcmf_ops_sdio_remove,
        .name = "brcmfmac",
        .id_table = brcmf_sdmmc_ids,

diff --git a/patches/network/46-use_other_workqueue.patch b/patches/network/46-use_other_workqueue.patch
index 799cc162b20bc75a3175aa63ec3dd63fc56c68cf..da4dd88ad348a38be5e286e15a3cc159817e975b 100644 (file)
--- a/patches/network/46-use_other_workqueue.patch
+++ b/patches/network/46-use_other_workqueue.patch
@@ -4,7 +4,7 @@ position before.
 
 --- a/net/bluetooth/hci_core.c
 +++ b/net/bluetooth/hci_core.c
-@@ -1724,8 +1724,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1726,8 +1726,12 @@ int hci_register_dev(struct hci_dev *hde
        list_add(&hdev->list, &hci_dev_list);
        write_unlock(&hci_dev_list_lock);
  

diff --git a/patches/network/47-no_trans_start_on_netdev_queue.patch b/patches/network/47-no_trans_start_on_netdev_queue.patch
index e580d7cfb0604f719f2d2767028d6d7a3854d536..9950b5486857cad23c7356f7041a2f5574fe2870 100644 (file)
--- a/patches/network/47-no_trans_start_on_netdev_queue.patch
+++ b/patches/network/47-no_trans_start_on_netdev_queue.patch
@@ -4,7 +4,7 @@ on older kernels.
 
 --- a/drivers/net/wireless/mwifiex/init.c
 +++ b/drivers/net/wireless/mwifiex/init.c
-@@ -368,8 +368,10 @@ void mwifiex_set_trans_start(struct net_
+@@ -372,8 +372,10 @@ void mwifiex_set_trans_start(struct net_
  {
        int i;
  

diff --git a/patches/network/53-pr_fmt.patch b/patches/network/53-pr_fmt.patch
index f1af0164b8f26b9bb34c11da292cbc833122c5b5..181ea864eaae390ba7cf7221cb4034919388e4e8 100644 (file)
--- a/patches/network/53-pr_fmt.patch
+++ b/patches/network/53-pr_fmt.patch
@@ -824,11 +824,11 @@ compiler warnings. This is going to be sent upstream.
 @@ -58,8 +58,10 @@
   * THE POSSIBILITY OF SUCH DAMAGES.
   */
-
+ 
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
+ 
 +#include <linux/printk.h>
  #include <linux/export.h>
  #include <linux/moduleparam.h>
-
+ 

diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch
index 9aeba44fd350bfadeb380cc781958312bcd36c47..286164c610fadc3b0d9da5377873e37f2b6df140 100644 (file)
--- a/patches/network/62-usb_driver_lpm.patch
+++ b/patches/network/62-usb_driver_lpm.patch
@@ -108,7 +108,7 @@
  static int ath6kl_usb_init(void)
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1360,7 +1360,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1371,7 +1371,9 @@ static struct usb_driver ath9k_hif_usb_d
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
        .soft_unbind = 1,
  #endif
@@ -132,7 +132,7 @@
  module_usb_driver(carl9170_driver);
 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
-@@ -1598,7 +1598,9 @@ static struct usb_driver brcmf_usbdrvr =
+@@ -1625,7 +1625,9 @@ static struct usb_driver brcmf_usbdrvr =
        .suspend = brcmf_usb_suspend,
        .resume = brcmf_usb_resume,
        .supports_autosuspend = 1,
@@ -216,7 +216,7 @@
  module_usb_driver(rt2500usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1322,7 +1322,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1283,7 +1283,9 @@ static struct usb_driver rt2800usb_drive
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,