From patchwork Mon Mar 28 11:33:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 668231 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 p2SBb5j9010648 for ; Mon, 28 Mar 2011 11:37:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269Ab1C1LhD (ORCPT ); Mon, 28 Mar 2011 07:37:03 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:58041 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753169Ab1C1LhB (ORCPT ); Mon, 28 Mar 2011 07:37:01 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so3686803wwa.1 for ; Mon, 28 Mar 2011 04:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=mLyqg30YLRu3d/JABagfc8zilxoqDaJ6/HJ4q33C0Kw=; b=IAH1xnB3cKzuHSo3gVo8fxLb+PvVzfiVq8QEl8B8a7KSVq6uy4j0CwRK4XZizyB0nn viuOsTmMqaLj1T1CW66IaE5c2gWrn99akD3VFSOvgGAG4vsuBDRYNMcWvO8qSAx/JAEc 7Zd9fcCxmVYh55vwucmXTI8SjC7440Pbd3uEc= 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=plSEKJos4bprES0LqlzdnWKpIFV7BRR79Pb+xIohNvlRU9wnMmG8IqAQpv146z1bVM ll/xRfRXEdnEuwg3kA6ZKMJMJsu62xzkC6FtXDPbob/cFRUdMrnwXPVwTsG9ghalNjEd gNS66CTsWZ9xwbZiBgeaDffNLoHw4Gzoz7nEM= Received: by 10.216.9.200 with SMTP id 50mr2620026wet.83.1301312221248; Mon, 28 Mar 2011 04:37:01 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id h11sm1945140wbc.9.2011.03.28.04.36.59 (version=SSLv3 cipher=OTHER); Mon, 28 Mar 2011 04:37:00 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 08/13] rt2x00: Remove obsolete rt2x00queue_align_payload Date: Mon, 28 Mar 2011 13:33:04 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201103281329.45470.IvDoorn@gmail.com> <201103281332.01948.IvDoorn@gmail.com> <201103281332.34565.IvDoorn@gmail.com> In-Reply-To: <201103281332.34565.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103281333.05671.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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Mar 2011 11:37:06 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index d63b582..55c1d03 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -512,8 +512,6 @@ void rt2x00lib_rxdone(struct queue_entry *entry) (rxdesc.size > header_length) && (rxdesc.dev_flags & RXDONE_L2PAD)) rt2x00queue_remove_l2pad(entry->skb, header_length); - else - rt2x00queue_align_payload(entry->skb, header_length); /* Trim buffer to correct size */ skb_trim(entry->skb, rxdesc.size); diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index 2d94cba..63c40d4 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h @@ -119,16 +119,6 @@ void rt2x00queue_free_skb(struct queue_entry *entry); void rt2x00queue_align_frame(struct sk_buff *skb); /** - * rt2x00queue_align_payload - Align 802.11 payload to 4-byte boundary - * @skb: The skb to align - * @header_length: Length of 802.11 header - * - * Align the 802.11 payload to a 4-byte boundary, this could - * mean the header is not aligned properly though. - */ -void rt2x00queue_align_payload(struct sk_buff *skb, unsigned int header_length); - -/** * rt2x00queue_insert_l2pad - Align 802.11 header & payload to 4-byte boundary * @skb: The skb to align * @header_length: Length of 802.11 header diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 4b3c70e..5d89259 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -148,19 +148,6 @@ void rt2x00queue_align_frame(struct sk_buff *skb) skb_trim(skb, frame_length); } -void rt2x00queue_align_payload(struct sk_buff *skb, unsigned int header_length) -{ - unsigned int frame_length = skb->len; - unsigned int align = ALIGN_SIZE(skb, header_length); - - if (!align) - return; - - skb_push(skb, align); - memmove(skb->data, skb->data + align, frame_length); - skb_trim(skb, frame_length); -} - void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length) { unsigned int payload_length = skb->len - header_length;