On Thu, 2013-04-11 at 14:40 +0200, Sebastian Hesselbarth wrote: > This patch adds GRO support to mv643xx_eth by making it invoke > napi_gro_receive instead of netif_receive_skb.
The inet_lro support should be removed at the same time; inet_lro is now deprecated and there should be no need to keep both of them. Ben. > Signed-off-by: Soeren Moch <sm...@web.de> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com> > --- > Cc: "David S. Miller" <da...@davemloft.net> > Cc: Lennert Buytenhek <buyt...@wantstofly.org> > Cc: Andrew Lunn <and...@lunn.ch> > Cc: Jason Cooper <ja...@lakedaemon.net> > Cc: Florian Fainelli <flor...@openwrt.org> > Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> > Cc: Paul Mackerras <pau...@samba.org> > Cc: Dale Farnsworth <d...@farnsworth.org> > Cc: net...@vger.kernel.org > Cc: linux-arm-ker...@lists.infradead.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-ker...@vger.kernel.org > --- > drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c > b/drivers/net/ethernet/marvell/mv643xx_eth.c > index 305038f..c850d04 100644 > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c > @@ -604,7 +604,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) > lro_receive_skb(&rxq->lro_mgr, skb, (void *)cmd_sts); > lro_flush_needed = 1; > } else > - netif_receive_skb(skb); > + napi_gro_receive(&mp->napi, skb); > > continue; > -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
