From patchwork Sat Dec 8 14:24:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1852521 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B5F943FC8C for ; Sat, 8 Dec 2012 14:25:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754646Ab2LHOZE (ORCPT ); Sat, 8 Dec 2012 09:25:04 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:61511 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754269Ab2LHOZD (ORCPT ); Sat, 8 Dec 2012 09:25:03 -0500 Received: by mail-bk0-f46.google.com with SMTP id q16so560871bkw.19 for ; Sat, 08 Dec 2012 06:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:cc:from:date:mime-version:content-type :content-transfer-encoding:message-id; bh=U6BE6CYcvcheP77b7im62BUM0P94+oUqLJu9uP3MviE=; b=CYXi1SLk/l/UauRCMMp1g2Oww8v/D51vQydU3DYrHCWU8poRKxxfOpW4N7EjjHQ7vW KwRjTs41CCkMrFMJ/yLLjXJUKzzRkxm87iMSm5meN0e5X46QHcKXAyjIOIrJA4vQOFOK Lvb6hoF8HE/np2ndsLxNngJghJPcmVoNB1wodAVD79mSVuO6L4bjX3Lst3zrvk16yY8E RV2m1qeJzTFx86RHtsTERhhxi7AgzpO22ahNXl+NfSP/1AlAc0IhxGnj2AyfgYX9bqyH UJfPUsQh1EgmubFeNFOKSuiFub4U1SFkUpzfZZ15YS17YWlX55cPtb4DTT9uBpWgEAgx HcOg== Received: by 10.204.141.4 with SMTP id k4mr2847400bku.60.1354976701407; Sat, 08 Dec 2012 06:25:01 -0800 (PST) Received: from debian64.localnet (pD9F891C1.dip.t-dialin.net. [217.248.145.193]) by mx.google.com with ESMTPS id f24sm10913686bkv.7.2012.12.08.06.24.59 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 08 Dec 2012 06:25:00 -0800 (PST) Received: from localhost ([127.0.0.1] helo=debian64.localnet ident=chuck) by debian64.localnet with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1ThLKr-0002tL-NE; Sat, 08 Dec 2012 15:24:57 +0100 Subject: [PATCH] carl9170: fix copy and paste mishap in carl9170_handle_mpdu To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com From: Christian Lamparter Date: Sat, 8 Dec 2012 15:24:56 +0100 MIME-Version: 1.0 Message-Id: <201212081524.56550.chunkeey@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- drivers/net/wireless/ath/carl9170/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 876a773..4684dd9 100644 --- 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 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; }