From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH] [-MM, FIX] ixgbe: incorporate napi_struct changes from net-2.6.24.git Date: Wed, 12 Sep 2007 16:14:19 -0700 Message-ID: <20070912161419.f6764d34.akpm@linux-foundation.org> References: <20070912181307.13189.33476.stgit@localhost.localdomain> <20070912151643.cb0e070b.akpm@linux-foundation.org> <46E86611.60307@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, netdev@vger.kernel.org, jeff@garzik.org, jesse.brandeburg@intel.com To: "Kok, Auke" Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:45205 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbXILXOb (ORCPT ); Wed, 12 Sep 2007 19:14:31 -0400 In-Reply-To: <46E86611.60307@intel.com> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Wed, 12 Sep 2007 15:20:01 -0700 "Kok, Auke" wrote: > Andrew Morton wrote: > > On Wed, 12 Sep 2007 11:13:07 -0700 > > Auke Kok wrote: > > > >> This incorporates the new napi_struct changes into ixgbe. > > > > I get a reject storm. > > > >> --- a/drivers/net/ixgbe/ixgbe_main.c > >> +++ b/drivers/net/ixgbe/ixgbe_main.c > >> @@ -557,14 +557,15 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data) > >> struct ixgbe_adapter *adapter = rxr->adapter; > >> > >> IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rxr->eims_value); > >> - netif_rx_schedule(adapter->netdev); > >> + netif_rx_schedule(adapter->netdev, &adapter->napi); > >> return IRQ_HANDLED; > >> } > >> > > > > For example, my copy of ixgbe_msix_clean_rx(), from > > git://lost.foo-projects.org/~aveerani/git/linux-2.6#ixgbe is: > > please drop that tree, and get the one I posted last week instead: > > git://lost.foo-projects.org/~ahkok/linux-2.6 ixgbe-20070905-submission I think I just ignored that branch. It looks like some frozen-week-old snapshot, whereas I like to get the latest tip-of-tree. Or is that branch just misnamed?