aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2016-07-14 18:15:48 +0200
committerMathias Kresin <dev@kresin.me>2016-11-09 20:02:18 +0100
commitb6832817eb39ff237f663a5f0e6245414470ed37 (patch)
tree7e592cf0837825bb86fb21f3566ca92d577664f7 /package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
parente7c019c24d2c7b367b2c8e58b424d2b7c6c27724 (diff)
downloadupstream-b6832817eb39ff237f663a5f0e6245414470ed37.tar.gz
upstream-b6832817eb39ff237f663a5f0e6245414470ed37.tar.bz2
upstream-b6832817eb39ff237f663a5f0e6245414470ed37.zip
mac80211: rt2x00: add support for mac addr from device tree
Backport upstream accepted patch which allows to override the EEPROM mac address with one from device tree. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch')
-rw-r--r--package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch6
1 files changed, 3 insertions, 3 deletions
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 3cf6268155..58e57fed3d 100644
--- a/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
+++ b/package/kernel/mac80211/patches/622-rt2x00-fix-beacon-bit-balance.patch
@@ -17,7 +17,7 @@
/*
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-@@ -144,7 +144,8 @@ static void rt2x00lib_intf_scheduled_ite
+@@ -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 @@ static void rt2x00lib_beaconupdate_iter(
+@@ -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 @@ static void rt2x00lib_beaconupdate_iter(
+@@ -221,7 +223,8 @@ static void rt2x00lib_beaconupdate_iter(
* never be called for USB devices.
*/
WARN_ON(rt2x00_is_usb(rt2x00dev));