mac80211: merge fix for carl9170 upstream regression

SVN-Revision: 34590

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index d26ec2640e70626153ba68170fa81bd19ff5d02f..d22f8d76b3bd5b706094f2ebbbb83fb6673842d1 100644 (file)
--- 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;
+ }