From patchwork Sat May 8 21:40:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gertjan van Wingerde X-Patchwork-Id: 97943 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o48LeZAt031246 for ; Sat, 8 May 2010 21:40:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754083Ab0EHVkn (ORCPT ); Sat, 8 May 2010 17:40:43 -0400 Received: from cpsmtpb-ews06.kpnxchange.com ([213.75.39.9]:2018 "EHLO cpsmtpb-ews06.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753597Ab0EHVkc (ORCPT ); Sat, 8 May 2010 17:40:32 -0400 Received: from cpbrm-ews28.kpnxchange.com ([10.94.84.159]) by cpsmtpb-ews06.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 8 May 2010 23:40:29 +0200 Received: from CPSMTPM-EML110.kpnxchange.com ([195.121.3.14]) by cpbrm-ews28.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 8 May 2010 23:40:29 +0200 Received: from wingerd.gvw.nl ([86.87.118.224]) by CPSMTPM-EML110.kpnxchange.com with Microsoft SMTPSVC(7.0.6001.18000); Sat, 8 May 2010 23:40:30 +0200 Received: by wingerd.gvw.nl (Postfix, from userid 501) id 38B2F60036; Sat, 8 May 2010 23:40:29 +0200 (CEST) From: Gertjan van Wingerde To: "John W. Linville" Cc: Ivo van Doorn , , , Gertjan van Wingerde Subject: [PATCH 1/9] rt2x00: Fix setting of txdesc->length field. Date: Sat, 8 May 2010 23:40:18 +0200 Message-Id: <1273354826-4335-2-git-send-email-gwingerde@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273354826-4335-1-git-send-email-gwingerde@gmail.com> References: <1273354826-4335-1-git-send-email-gwingerde@gmail.com> X-OriginalArrivalTime: 08 May 2010 21:40:30.0191 (UTC) FILETIME=[14827FF0:01CAEEF7] X-RecipientDomain: vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 08 May 2010 21:40:59 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c index d291c78..583dacd 100644 --- a/drivers/net/wireless/rt2x00/rt2x00crypto.c +++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c @@ -128,6 +128,7 @@ void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, struct txentry_desc *txdesc) /* Pull buffer to correct size */ skb_pull(skb, txdesc->iv_len); + txdesc->length -= txdesc->iv_len; /* IV/EIV data has officially been stripped */ skbdesc->flags |= SKBDESC_IV_STRIPPED;