aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/608-add_platform_data_mac_addr.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-11 12:30:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-11 12:30:50 +0000
commit3153b7589c0831fdce97081d1ecf5b9310725576 (patch)
tree5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/608-add_platform_data_mac_addr.patch
parent312a176995ecf1b1b97a048451e4ff28b4336f85 (diff)
downloadupstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz
upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2
upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/608-add_platform_data_mac_addr.patch')
-rw-r--r--package/mac80211/patches/608-add_platform_data_mac_addr.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/mac80211/patches/608-add_platform_data_mac_addr.patch
index a910cc36c0..4c2a8b8332 100644
--- a/package/mac80211/patches/608-add_platform_data_mac_addr.patch
+++ b/package/mac80211/patches/608-add_platform_data_mac_addr.patch
@@ -10,7 +10,7 @@
int disable_5ghz;
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -928,6 +928,18 @@ static void rt2x00lib_rate(struct ieee80
+@@ -931,6 +931,18 @@ static void rt2x00lib_rate(struct ieee80
entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
}
@@ -31,7 +31,7 @@
{
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -1401,6 +1401,7 @@ static inline void rt2x00debug_dump_fram
+@@ -1406,6 +1406,7 @@ static inline void rt2x00debug_dump_fram
*/
u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
struct ieee80211_vif *vif);