From patchwork Mon Aug 17 16:54:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 42073 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7HGugAH027587 for ; Mon, 17 Aug 2009 16:56:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932142AbZHQQ4b (ORCPT ); Mon, 17 Aug 2009 12:56:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932141AbZHQQ4b (ORCPT ); Mon, 17 Aug 2009 12:56:31 -0400 Received: from mail-ew0-f214.google.com ([209.85.219.214]:64136 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757284AbZHQQ43 (ORCPT ); Mon, 17 Aug 2009 12:56:29 -0400 Received: by mail-ew0-f214.google.com with SMTP id 10so3097890ewy.37 for ; Mon, 17 Aug 2009 09:56:30 -0700 (PDT) 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-disposition:message-id:content-type :content-transfer-encoding; bh=mVnBmrf78VqmSXZJ6syHmttX/Q+WFVy0AHYb8Z6ECdE=; b=dITVOqTQnsD1gWnSun0uuJ/HUbSi91yOmcpaI5JH3wdrHyaqiLIY2QNfFYLQFagZNm 1jHfc5mHjONs5BkHXMi/nNywhDMh+cyqnfrH1sXt5j1zIYgqsodjKXgnD8cwTNzv1CUP GBDGJmYFjE05MULblvcGZAnyvSPLKt8P2p8Zo= 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-disposition:message-id:content-type :content-transfer-encoding; b=QEXvD4/WvgF849EaPlneHLMgC7K6auKnHE5P8LU5RVAR/khLGoDGTDYTmk5xunyCFR 1Bu6ogXtqo/lIDy0Bs2RB+0UQIrwH0eMN12V9wLYHh7U+ulcpHxXgDkWfKdyU4LUHNV8 5pSM/7XaMV2rpjzQOs7YbD9S4Y0CriNQ7sH54= Received: by 10.211.137.19 with SMTP id p19mr1867887ebn.53.1250528190420; Mon, 17 Aug 2009 09:56:30 -0700 (PDT) Received: from ?192.168.8.42? (k19232.upc-k.chello.nl [62.108.19.232]) by mx.google.com with ESMTPS id 28sm10357786eye.44.2009.08.17.09.56.29 (version=SSLv3 cipher=RC4-MD5); Mon, 17 Aug 2009 09:56:30 -0700 (PDT) From: Ivo van Doorn To: John Linville Subject: [PATCH 4/7] rt2x00: Set SKBDESC_L2_PADDED in RX path Date: Mon, 17 Aug 2009 18:54:50 +0200 User-Agent: KMail/1.9.10 Cc: "linux-wireless" , users@host1.serialmonkey.com References: <200908171853.24256.IvDoorn@gmail.com> <200908171853.57397.IvDoorn@gmail.com> <200908171854.19205.IvDoorn@gmail.com> In-Reply-To: <200908171854.19205.IvDoorn@gmail.com> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200908171854.50790.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When the RX descriptor indicates the frame was L2 padded, the SKBDESC_L2_PADDED flag should be set to make sure the L2 padding is removed before it is send to mac80211. Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2800usb.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index c82474e..6de2eda 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -2163,8 +2163,10 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry, if (rt2x00_get_field32(rxd0, RXD_W0_MY_BSS)) rxdesc->dev_flags |= RXDONE_MY_BSS; - if (rt2x00_get_field32(rxd0, RXD_W0_L2PAD)) + if (rt2x00_get_field32(rxd0, RXD_W0_L2PAD)) { rxdesc->dev_flags |= RXDONE_L2PAD; + skbdesc->flags |= SKBDESC_L2_PADDED; + } if (rt2x00_get_field32(rxwi1, RXWI_W1_SHORT_GI)) rxdesc->flags |= RX_FLAG_SHORT_GI;