mac80211: merge fix for carl9170 upstream regression

SVN-Revision: 34590
2012-12-10 13:50:54 +00:00 · 2012-12-10 13:50:54 +00:00 · 77c14b1a99
parent 3cbc1a49e2
commit 77c14b1a99
1 changed files with 11 additions and 0 deletions
--- 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;
+ }