From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Dec 2012 13:50:54 +0000 (+0000)
Subject: mac80211: merge fix for carl9170 upstream regression
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=9ed6df8d409b5f89680ff9efe635d96692c42649

mac80211: merge fix for carl9170 upstream regression

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34590 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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;
+ }