mac80211: brcmfmac: backport wowlan netdetect fixes

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 622-rt2x00-fix-beacon-bit-balance.patch

diff --git a/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch b/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
index 78bc89fd3a045c88c7d39feb026215c70c7461c1..58e57fed3db2b7ac4ad786cc5427251afafbe4a0 100644 (file)
--- a/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
+++ b/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
@@ -1,6 +1,6 @@
---- a/drivers/net/wireless/rt2x00/rt2x00mac.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
-@@ -632,12 +632,8 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
+@@ -627,12 +627,8 @@ void rt2x00mac_bss_info_changed(struct i
                } else if (bss_conf->enable_beacon && !intf->enable_beacon) {
                        rt2x00dev->intf_beaconing++;
                        intf->enable_beacon = true;
@@ -15,9 +15,9 @@
  
                        if (rt2x00dev->intf_beaconing == 1) {
                                /*
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -144,7 +144,8 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+@@ -145,7 +145,8 @@ static void rt2x00lib_intf_scheduled_ite
  
        if (test_and_clear_bit(DELAYED_UPDATE_BEACON, &intf->delayed_flags)) {
                mutex_lock(&intf->beacon_skb_mutex);
@@ -27,7 +27,7 @@
                mutex_unlock(&intf->beacon_skb_mutex);
        }
  }
-@@ -207,6 +208,7 @@
+@@ -208,6 +209,7 @@ static void rt2x00lib_beaconupdate_iter(
                                        struct ieee80211_vif *vif)
  {
        struct rt2x00_dev *rt2x00dev = data;
@@ -35,7 +35,7 @@
  
        if (vif->type != NL80211_IFTYPE_AP &&
            vif->type != NL80211_IFTYPE_ADHOC &&
-@@ -220,7 +222,8 @@
+@@ -221,7 +223,8 @@ static void rt2x00lib_beaconupdate_iter(
         * never be called for USB devices.
         */
        WARN_ON(rt2x00_is_usb(rt2x00dev));