From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francois Romieu Subject: Re: [PATCH 3/3] chelsio: more receive cleanup Date: Fri, 15 Dec 2006 21:10:19 +0100 Message-ID: <20061215201019.GA11385@electric-eye.fr.zoreil.com> References: <20061215190716.956791000@osdl.org> <20061215190813.803776000@osdl.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jeff Garzik , netdev@vger.kernel.org Return-path: Received: from electric-eye.fr.zoreil.com ([213.41.134.224]:60504 "EHLO fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753339AbWLOU3K (ORCPT ); Fri, 15 Dec 2006 15:29:10 -0500 To: Stephen Hemminger Content-Disposition: inline In-Reply-To: <20061215190813.803776000@osdl.org> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Stephen Hemminger : [...] > --- linux-2.6.20-rc1.orig/drivers/net/chelsio/sge.c > +++ linux-2.6.20-rc1/drivers/net/chelsio/sge.c [...] > @@ -1059,37 +1062,33 @@ static void recycle_fl_buf(struct freelQ > * threshold and the packet is too big to copy, or (b) the packet should > * be copied but there is no memory for the copy. > */ > -static inline struct sk_buff *get_packet(struct pci_dev *pdev, > - struct freelQ *fl, unsigned int len, > - int dma_pad, int skb_pad, > - unsigned int copy_thres, > - unsigned int drop_thres) > +static inline struct sk_buff *get_packet(struct pci_dev *pdev, struct freelQ *fl, > + unsigned int len) > { > struct sk_buff *skb; > - struct freelQ_ce *ce = &fl->centries[fl->cidx]; > + const struct freelQ_ce *ce = &fl->centries[fl->cidx]; > + > + if (len < copybreak) { If you are into cleanups, maybe add likely/unlikely (and remove the inline) ? > + skb = alloc_skb(len + 2, GFP_ATOMIC); > + if (!skb) > + goto use_orig_buf; > > - if (len < copy_thres) { > - skb = alloc_skb(len + skb_pad, GFP_ATOMIC); > - if (likely(skb != NULL)) { > - skb_reserve(skb, skb_pad); > - skb_put(skb, len); > - pci_dma_sync_single_for_cpu(pdev, > + skb_reserve(skb, 2); /* align IP header */ s/2/NET_IP_ALIGN/ Btw, since the driver supports netpoll, its blind enabling of interrupts in t1_poll() seems old-fashoined (see thread starting at http://lkml.org/lkml/2006/12/12/86) -- Ueimor