aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-10 13:50:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-10 13:50:54 +0000
commit469e1c3a80743dd70e6047a9b725e3002a6248ef (patch)
treee1ff4956f6ff604c29dd61cca7fd4251d417fcec /package/mac80211
parent6a35fd725855ddb17abb4eaa47ddfe63f3e1ef46 (diff)
downloadupstream-469e1c3a80743dd70e6047a9b725e3002a6248ef.tar.gz
upstream-469e1c3a80743dd70e6047a9b725e3002a6248ef.tar.bz2
upstream-469e1c3a80743dd70e6047a9b725e3002a6248ef.zip
mac80211: merge fix for carl9170 upstream regression
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34590 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/300-pending_work.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index d26ec2640e..d22f8d76b3 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -550,3 +550,14 @@
struct ath_rx_stats rxstats;
struct ath_dfs_stats dfs_stats;
u32 reset[__RESET_TYPE_MAX];
+--- a/drivers/net/wireless/ath/carl9170/rx.c
++++ b/drivers/net/wireless/ath/carl9170/rx.c
+@@ -684,7 +684,7 @@ static int carl9170_handle_mpdu(struct a
+ if (!skb)
+ return -ENOMEM;
+
+- memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
++ memcpy(IEEE80211_SKB_RXCB(skb), status, sizeof(*status));
+ ieee80211_rx(ar->hw, skb);
+ return 0;
+ }