From patchwork Sat Nov 13 18:12:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 322642 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oADIEQ5r012678 for ; Sat, 13 Nov 2010 18:14:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757273Ab0KMSOY (ORCPT ); Sat, 13 Nov 2010 13:14:24 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:33747 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756861Ab0KMSOW (ORCPT ); Sat, 13 Nov 2010 13:14:22 -0500 Received: by mail-ew0-f46.google.com with SMTP id 8so221913ewy.19 for ; Sat, 13 Nov 2010 10:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=n+6Wp3Lmb9lJGD0Fv3T6Q3lBsmm4TwnmRhyTe3R2Gyw=; b=AI5RSZ4pqx85I2q82Ey1WLzWecR222eP8L8H/UUlRefMv0qGu9O7EO3NYTi2NvRlzg mop+X2S/wVX6bhpfSfzTNYY6hzqxUJtOJGYiDnaB4P2ZhIJAlx+zRE+579P3lEI+Eopl 54wGsbAIIawjSp9KLQVNNLfkrlcxGqF7oLTq8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=q2GmNJETOZ9QtQEYxxUAEjycGEacH47h33M1e0X62QNyrG/14kkvO72gTzLZrTFzhV yGpuDJ+uzSUqqfpgZApzIprOQLHck1QZoC52TUTBA0SvXDeNmd/OhCLAUCs82UpG7lvj wwC4al0cOcYyUYSmzpzvAnki20YcKVJxPcFxw= Received: by 10.213.17.135 with SMTP id s7mr3328486eba.21.1289672062193; Sat, 13 Nov 2010 10:14:22 -0800 (PST) Received: from localhost.localdomain (a0236.upc-a.chello.nl [62.163.0.236]) by mx.google.com with ESMTPS id w20sm4612023eeh.18.2010.11.13.10.14.20 (version=SSLv3 cipher=RC4-MD5); Sat, 13 Nov 2010 10:14:21 -0800 (PST) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 8/9] rt2x00: Fix header_length in rt2x00lib_txdone Date: Sat, 13 Nov 2010 19:12:54 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.32.23-170.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201011131908.15595.IvDoorn@gmail.com> <201011131911.22874.IvDoorn@gmail.com> <201011131911.47346.IvDoorn@gmail.com> In-Reply-To: <201011131911.47346.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201011131912.55384.IvDoorn@gmail.com> 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 (demeter1.kernel.org [140.211.167.41]); Sat, 13 Nov 2010 18:14:27 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 3afa2a3..c879f9a 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -250,10 +250,9 @@ void rt2x00lib_txdone(struct queue_entry *entry, struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb); struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); enum data_queue_qid qid = skb_get_queue_mapping(entry->skb); - unsigned int header_length = ieee80211_get_hdrlen_from_skb(entry->skb); + unsigned int header_length, i; u8 rate_idx, rate_flags, retry_rates; u8 skbdesc_flags = skbdesc->flags; - unsigned int i; bool success; /* @@ -272,6 +271,11 @@ void rt2x00lib_txdone(struct queue_entry *entry, skbdesc->flags &= ~SKBDESC_DESC_IN_SKB; /* + * Determine the length of 802.11 header. + */ + header_length = ieee80211_get_hdrlen_from_skb(entry->skb); + + /* * Remove L2 padding which was added during */ if (test_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags))