From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@bootlin.com (Gregory CLEMENT) Date: Wed, 29 Aug 2018 11:37:14 +0200 Subject: [PATCH 3/5] net: mvneta: Don't check NETIF_F_GRO ourself In-Reply-To: <20180829162836.2551ba46@xhacker.debian> (Jisheng Zhang's message of "Wed, 29 Aug 2018 16:28:36 +0800") References: <20180829162456.2bd69796@xhacker.debian> <20180829162836.2551ba46@xhacker.debian> Message-ID: <875zztjyyd.fsf@bootlin.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Jisheng, On mer., ao?t 29 2018, Jisheng Zhang wrote: > napi_gro_receive() checks NETIF_F_GRO bit as well, if the bit is not > set, we will go through GRO_NORMAL in napi_skb_finish(), so fall back > to netif_receive_skb_internal(), so we don't need to check NETIF_F_GRO > ourself. this one is not a fix and it should go to net-next. And for the patch it looks OK: Reviewed-by: Gregory CLEMENT Thanks, Gregory > > Signed-off-by: Jisheng Zhang > --- > drivers/net/ethernet/marvell/mvneta.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c > index d9206094fce3..06634d4f9b94 100644 > --- a/drivers/net/ethernet/marvell/mvneta.c > +++ b/drivers/net/ethernet/marvell/mvneta.c > @@ -2065,10 +2065,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, > /* Linux processing */ > rxq->skb->protocol = eth_type_trans(rxq->skb, dev); > > - if (dev->features & NETIF_F_GRO) > - napi_gro_receive(napi, rxq->skb); > - else > - netif_receive_skb(rxq->skb); > + napi_gro_receive(napi, rxq->skb); > > /* clean uncomplete skb pointer in queue */ > rxq->skb = NULL; > -- > 2.18.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com