From patchwork Mon Dec 15 01:57:36 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Ortiz X-Patchwork-Id: 13970 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E2F34DDFB5 for ; Mon, 15 Dec 2008 13:03:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbYLOCDd (ORCPT ); Sun, 14 Dec 2008 21:03:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751881AbYLOCDb (ORCPT ); Sun, 14 Dec 2008 21:03:31 -0500 Received: from 42.mail-out.ovh.net ([213.251.189.42]:44683 "HELO 42.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751778AbYLOCDN (ORCPT ); Sun, 14 Dec 2008 21:03:13 -0500 Received: (qmail 6699 invoked by uid 503); 15 Dec 2008 01:56:13 -0000 Received: from b7.ovh.net (HELO mail246.ha.ovh.net) (213.186.33.57) by 42.mail-out.ovh.net with SMTP; 15 Dec 2008 01:56:13 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 15 Dec 2008 01:56:33 -0000 Received: from aannecy-256-1-36-87.w90-10.abo.wanadoo.fr (HELO sortiz-mobl) (samuel%sortiz.org@90.10.35.87) by ns0.ovh.net with SMTP; 15 Dec 2008 01:56:32 -0000 Message-Id: <20081215015902.740698225@sortiz.org> References: <20081215015729.587697008@sortiz.org> User-Agent: quilt/0.46-1 Date: Mon, 15 Dec 2008 02:57:36 +0100 From: Samuel Ortiz To: "David S. Miller" Cc: netdev@vger.kernel.org, irda-users@lists.sourceforge.net Subject: [RFC PATCH 7/9] irda: Stack RX path callers should use irda_dev_alloc_skb Content-Disposition: inline; filename=0007-irda-Stack-RX-path-callers-should-use-irda_dev_allo.patch X-Ovh-Tracer-Id: 13352891420790990998 X-Ovh-Remote: 90.10.35.87 (aannecy-256-1-36-87.w90-10.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Samuel Ortiz --- net/irda/irttp.c | 2 +- net/irda/wrapper.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 4b913de..6f28186 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c @@ -241,7 +241,7 @@ static struct sk_buff *irttp_reassemble_skb(struct tsap_cb *self) IRDA_DEBUG(2, "%s(), self->rx_sdu_size=%d\n", __func__, self->rx_sdu_size); - skb = dev_alloc_skb(TTP_HEADER + self->rx_sdu_size); + skb = irda_dev_alloc_skb(TTP_HEADER + self->rx_sdu_size); if (!skb) return NULL; diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c index b13cb3b..e1ab6d1 100644 --- a/net/irda/wrapper.c +++ b/net/irda/wrapper.c @@ -225,7 +225,8 @@ async_bump(struct net_device *dev, (rx_buff->len < IRDA_RX_COPY_THRESHOLD)); /* Allocate a new skb */ - newskb = dev_alloc_skb(docopy ? rx_buff->len + 1 : rx_buff->truesize); + newskb = irda_dev_alloc_skb(docopy ? + rx_buff->len + 1 : rx_buff->truesize); if (!newskb) { stats->rx_dropped++; /* We could deliver the current skb if doing ZeroCopy Rx,