| Message ID | 20180829162836.2551ba46@xhacker.debian |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: mvneta: some bug fix and trivial improvement | expand |
Hi Jisheng, On mer., août 29 2018, Jisheng Zhang <Jisheng.Zhang@synaptics.com> 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 <gregory.clement@bootlin.com> Thanks, Gregory > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > --- > 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@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
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;
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. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- drivers/net/ethernet/marvell/mvneta.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)