]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
carl9170: fix copy and paste mishap in carl9170_handle_mpdu
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 8 Dec 2012 14:24:56 +0000 (15:24 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 10 Dec 2012 20:47:31 +0000 (15:47 -0500)
This patch fixes a regression which was introduced by:
"carl9170: split up carl9170_handle_mpdu"

Previously, the ieee80211_rx_status was kept on the
stack of carl9170_handle_mpdu. Now it's passed into
the function as a pointer parameter. Hence, the old
memcpy call needs to be fixed.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/carl9170/rx.c

index 876a773fd0b4e792a74a97ef67dc234063f227d0..4684dd9894961a84dca6cf0f8abe099b6eb8fe92 100644 (file)
@@ -684,7 +684,7 @@ static int carl9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len,
        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;
 }