| Message ID | 20190513073033.15015-1-maxime.chevallier@bootlin.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] net: mvpp2: cls: Add missing NETIF_F_NTUPLE flag | expand |
From: Maxime Chevallier <maxime.chevallier@bootlin.com> Date: Mon, 13 May 2019 09:30:33 +0200 > Now that the mvpp2 driver supports classification offloading, we must > add the NETIF_F_NTUPLE to the features list. > > Since the current code doesn't allow disabling the feature, we don't set > the flag in dev->hw_features. > > Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support") > Reported-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> > --- > V2: Rebased on latest -net, added Jakub's Ack, gave more details in the > commit log about not adding the flag in hw_features. Applied, thanks.
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 56d43d9b43ef..d38952eb7aa9 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5058,8 +5058,10 @@ static int mvpp2_port_probe(struct platform_device *pdev, dev->hw_features |= features | NETIF_F_RXCSUM | NETIF_F_GRO | NETIF_F_HW_VLAN_CTAG_FILTER; - if (mvpp22_rss_is_supported()) + if (mvpp22_rss_is_supported()) { dev->hw_features |= NETIF_F_RXHASH; + dev->features |= NETIF_F_NTUPLE; + } if (port->pool_long->id == MVPP2_BM_JUMBO && port->id != 0) { dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
Now that the mvpp2 driver supports classification offloading, we must add the NETIF_F_NTUPLE to the features list. Since the current code doesn't allow disabling the feature, we don't set the flag in dev->hw_features. Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support") Reported-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- V2: Rebased on latest -net, added Jakub's Ack, gave more details in the commit log about not adding the flag in hw_features. drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)