compat-wireless: refresh patches

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

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 26bbfbef2f08c53438d298fa246029c16593f4ed..098d0450b342e1ee32a4a013b146c7edf5770eb4 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -220,7 +220,7 @@ calls on compat code with only slight modifications.
  static int __init iwl4965_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -4154,7 +4154,12 @@ static struct pci_driver iwl_driver = {
+@@ -4071,7 +4071,12 @@ static struct pci_driver iwl_driver = {
        .id_table = iwl_hw_card_ids,
        .probe = iwl_pci_probe,
        .remove = __devexit_p(iwl_pci_remove),
@@ -255,7 +255,7 @@ calls on compat code with only slight modifications.
  #endif /* CONFIG_PM */
 --- a/drivers/net/wireless/iwlwifi/iwl-core.h
 +++ b/drivers/net/wireless/iwlwifi/iwl-core.h
-@@ -520,7 +520,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
+@@ -514,7 +514,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
  #ifdef CONFIG_PM
  int iwl_pci_suspend(struct device *device);
  int iwl_pci_resume(struct device *device);

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index 05129d5f598af636656897ced5fecfc786b3fb20..385fbc8e287a1ffeb3d10ee1202cd70036428e28 100644 (file)
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
  
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1587,6 +1587,10 @@ static void ieee80211_xmit(struct ieee80
+@@ -1591,6 +1591,10 @@ static void ieee80211_xmit(struct ieee80
                                return;
                        }
  
@@ -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();
-@@ -2079,7 +2083,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2083,7 +2087,14 @@ void ieee80211_tx_pending(unsigned long
  
                if (skb_queue_empty(&local->pending[i]))
                        list_for_each_entry_rcu(sdata, &local->interfaces, list)

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index 88cd5d0b3a1bb7b1f7d1126cbee59fe261e42664..c20d9e2f83d252d26fc9621a79d0b588d556e809 100644 (file)
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -34,7 +34,7 @@ suspend and resume that are not backported.
  /*******************************************************************/
 --- a/drivers/net/wireless/mwifiex/sdio.c
 +++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -107,6 +107,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -108,6 +108,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
        }
  }
  
@@ -42,7 +42,7 @@ suspend and resume that are not backported.
  /*
   * SDIO suspend.
   *
-@@ -214,6 +215,7 @@ static int mwifiex_sdio_resume(struct de
+@@ -215,6 +216,7 @@ static int mwifiex_sdio_resume(struct de
  
        return 0;
  }
@@ -50,7 +50,7 @@ suspend and resume that are not backported.
  
  /* Device ID for SD8787 */
  #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
-@@ -226,10 +228,12 @@ static const struct sdio_device_id mwifi
+@@ -227,10 +229,12 @@ static const struct sdio_device_id mwifi
  
  MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
  
@@ -63,7 +63,7 @@ suspend and resume that are not backported.
  
  static struct sdio_driver mwifiex_sdio = {
        .name = "mwifiex_sdio",
-@@ -238,7 +242,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -239,7 +243,9 @@ static struct sdio_driver mwifiex_sdio =
        .remove = mwifiex_sdio_remove,
        .drv = {
                .owner = THIS_MODULE,
@@ -73,7 +73,7 @@ suspend and resume that are not backported.
        }
  };
  
-@@ -1725,8 +1731,10 @@ mwifiex_sdio_cleanup_module(void)
+@@ -1726,8 +1732,10 @@ mwifiex_sdio_cleanup_module(void)
        if (!adapter || !adapter->priv_num)
                goto exit;
  

diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
index a65623c819ae1de5527958757061936a7006c6f7..0a84deedbd92930856c16d48c03dc44bd32bb34b 100644 (file)
--- a/patches/36-workqueue.patch
+++ b/patches/36-workqueue.patch
@@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h
 
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -1058,6 +1058,10 @@ static void __exit ieee80211_exit(void)
+@@ -1061,6 +1061,10 @@ static void __exit ieee80211_exit(void)
        rc80211_minstrel_ht_exit();
        rc80211_minstrel_exit();
  

diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index 0f9f527a0dcaa447be32c36bb97085c4cd75b0cb..010499294562d0fe1c964690842071fa90a15853 100644 (file)
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -12,7 +12,7 @@
        case IWL_LED_DEFAULT:
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
-@@ -173,7 +173,9 @@ void iwl_leds_init(struct iwl_priv *priv
+@@ -191,7 +191,9 @@ void iwl_leds_init(struct iwl_priv *priv
                                   wiphy_name(priv->hw->wiphy));
        priv->led.brightness_set = iwl_led_brightness_set;
        priv->led.blink_set = iwl_led_blink_set;

diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index f02cddf28ded1f709764d44fee2bfc2aa1f6f1bf..92e036d534da9d0f24c9bc4e49108fa2b7d90b1c 100644 (file)
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -28,7 +28,7 @@
  #endif
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
-@@ -152,6 +152,7 @@ static void iwl_led_brightness_set(struc
+@@ -170,6 +170,7 @@ static void iwl_led_brightness_set(struc
        iwl_led_cmd(priv, on, 0);
  }
  
@@ -36,7 +36,7 @@
  static int iwl_led_blink_set(struct led_classdev *led_cdev,
                             unsigned long *delay_on,
                             unsigned long *delay_off)
-@@ -160,6 +161,7 @@ static int iwl_led_blink_set(struct led_
+@@ -178,6 +179,7 @@ static int iwl_led_blink_set(struct led_
  
        return iwl_led_cmd(priv, *delay_on, *delay_off);
  }
@@ -44,7 +44,7 @@
  
  void iwl_leds_init(struct iwl_priv *priv)
  {
-@@ -172,7 +174,9 @@ void iwl_leds_init(struct iwl_priv *priv
+@@ -190,7 +192,9 @@ void iwl_leds_init(struct iwl_priv *priv
        priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
                                   wiphy_name(priv->hw->wiphy));
        priv->led.brightness_set = iwl_led_brightness_set;