compat-wireless: refresh patches for next-20120109

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 249d47179c31230bd1e4e185f359a1da5073eac5..a81b7ac0c5ae55c2535cb2ebff6b86f6bf8e18bc 100644 (file)
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -35,7 +35,7 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1411,7 +1411,7 @@ struct il_priv {
+@@ -1412,7 +1412,7 @@ struct il_priv {
  
                } _3945;
  #endif

diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 83e6c7b18b66e575927e17b05416e7f3ef2e0dee..4349af6d9cfbe2ca90479e4380b7201f60a9dda1 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -51,7 +51,7 @@ thread in process context as well.
        b43_release_firmware(dev);
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -844,6 +844,9 @@ struct b43_wldev {
+@@ -855,6 +855,9 @@ struct b43_wldev {
        unsigned int tx_count;
        unsigned int rx_count;
  #endif

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index df979392a5d4271fb39ffc320ed1d1a863480e59..d0446d85fea53da46a67cf9ff8d9b7f3dbe861ab 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -118,7 +118,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3920,7 +3920,12 @@ static struct pci_driver il3945_driver =
+@@ -3919,7 +3919,12 @@ static struct pci_driver il3945_driver =
        .id_table = il3945_hw_card_ids,
        .probe = il3945_pci_probe,
        .remove = __devexit_p(il3945_pci_remove),
@@ -133,7 +133,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/4965-mac.c
 +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -6478,7 +6478,12 @@ static struct pci_driver il4965_driver =
+@@ -6457,7 +6457,12 @@ static struct pci_driver il4965_driver =
        .id_table = il4965_hw_card_ids,
        .probe = il4965_pci_probe,
        .remove = __devexit_p(il4965_pci_remove),
@@ -148,7 +148,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -5078,15 +5078,17 @@ il_pci_resume(struct device *device)
+@@ -5239,15 +5239,17 @@ il_pci_resume(struct device *device)
  }
  EXPORT_SYMBOL(il_pci_resume);
  
@@ -176,7 +176,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -2027,7 +2027,12 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -2028,7 +2028,12 @@ __le32 il_add_beacon_time(struct il_priv
  #ifdef CONFIG_PM
  int il_pci_suspend(struct device *device);
  int il_pci_resume(struct device *device);

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index eb5b5613382ff0b181315b6d55ed03e4de232cff..58726a16652436a31f70227a7dd61ed8135e24c4 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
-@@ -3141,7 +3141,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3121,7 +3121,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index c68a662c3614d0b68dd957f20fd824b5d28e2e0a..da533cff7827be2b9f9c1fbbbd509b2bf7385610 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -605,7 +605,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1018,8 +1025,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1020,8 +1027,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -618,7 +618,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -1031,7 +1042,11 @@ static int l2cap_sock_create(struct net
+@@ -1033,7 +1044,11 @@ static int l2cap_sock_create(struct net
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index fae58f0a06b28c2ba23e4866d89d35c401f60d4c..1420dd115d0076cc46cb3ab726fffbf01cbef0c2 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes);
 --- a/drivers/net/wireless/mwl8k.c
 +++ b/drivers/net/wireless/mwl8k.c
-@@ -2540,15 +2540,21 @@ struct mwl8k_cmd_mac_multicast_adr {
+@@ -2563,15 +2563,21 @@ struct mwl8k_cmd_mac_multicast_adr {
  
  static struct mwl8k_cmd_pkt *
  __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
@@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
        if (allmulti || mc_count > priv->num_mcaddrs) {
                allmulti = 1;
-@@ -2569,13 +2575,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
+@@ -2592,13 +2598,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
        if (allmulti) {
                cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST);
        } else if (mc_count) {
@@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                }
        }
  
-@@ -4723,7 +4743,11 @@ mwl8k_bss_info_changed(struct ieee80211_
+@@ -4803,7 +4823,11 @@ mwl8k_bss_info_changed(struct ieee80211_
  }
  
  static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
@@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  {
        struct mwl8k_cmd_pkt *cmd;
  
-@@ -4734,7 +4758,11 @@ static u64 mwl8k_prepare_multicast(struc
+@@ -4814,7 +4838,11 @@ static u64 mwl8k_prepare_multicast(struc
         * we'll end up throwing this packet away and creating a new
         * one in mwl8k_configure_filter().
         */
@@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
        return (unsigned long)cmd;
  }
-@@ -4856,7 +4884,11 @@ static void mwl8k_configure_filter(struc
+@@ -4936,7 +4964,11 @@ static void mwl8k_configure_filter(struc
         */
        if (*total_flags & FIF_ALLMULTI) {
                kfree(cmd);

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index 3703a3f9b662ecb4ab309af826d935b416faf839..601f77f5d0a46bdc30b4c1c898dae39bfeb309d8 100644 (file)
--- a/patches/30-bridge-port.patch
+++ b/patches/30-bridge-port.patch
@@ -23,7 +23,7 @@ compat-wireless.
 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -795,7 +795,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -799,7 +799,7 @@ int cfg80211_change_iface(struct cfg8021
                return -EOPNOTSUPP;
  
        /* if it's part of a bridge, reject changing type to station/ibss */

diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index ec33b21ee09f30171ac38dc225de12fcf530815b..793130c3eb93e929531ae7b36b57c9dd3e5dcc09 100644 (file)
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -402,7 +402,9 @@ il_leds_init(struct il_priv *il)
+@@ -563,7 +563,9 @@ il_leds_init(struct il_priv *il)
            kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
        il->led.brightness_set = il_led_brightness_set;
        il->led.blink_set = il_led_blink_set;

diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index ba43d8d889197599d032d4f2cc0e6a1681fe7a0f..8e34b8c69c7c1dafa5f868d178433c981871d9cc 100644 (file)
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -380,6 +380,7 @@ il_led_brightness_set(struct led_classde
+@@ -541,6 +541,7 @@ il_led_brightness_set(struct led_classde
        il_led_cmd(il, on, 0);
  }
  
@@ -8,7 +8,7 @@
  static int
  il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on,
                 unsigned long *delay_off)
-@@ -388,6 +389,7 @@ il_led_blink_set(struct led_classdev *le
+@@ -549,6 +550,7 @@ il_led_blink_set(struct led_classdev *le
  
        return il_led_cmd(il, *delay_on, *delay_off);
  }
@@ -16,7 +16,7 @@
  
  void
  il_leds_init(struct il_priv *il)
-@@ -401,7 +403,9 @@ il_leds_init(struct il_priv *il)
+@@ -562,7 +564,9 @@ il_leds_init(struct il_priv *il)
        il->led.name =
            kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
        il->led.brightness_set = il_led_brightness_set;