aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit77c14b1a9947c87eec646f24957603671746a83a (patch)
tree5f7ac65d31806fbe16589b86bd3af8438c4f8367 /package
parent3cbc1a49e27d42a1fc9012d51d8327b8c7ab1a89 (diff)
downloadupstream-77c14b1a9947c87eec646f24957603671746a83a.tar.gz
upstream-77c14b1a9947c87eec646f24957603671746a83a.tar.bz2
upstream-77c14b1a9947c87eec646f24957603671746a83a.zip
mac80211: merge fix for carl9170 upstream regression
SVN-Revision: 34590
Diffstat (limited to 'package')
-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;
+ }