Message ID | 20180501173210.GA5083@felix-thinkpad.cavium.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] liquidio VF: indicate that disabling rx vlan offload is not allowed | expand |
From: Felix Manlunas <felix.manlunas@cavium.com> Date: Tue, 1 May 2018 10:32:10 -0700 > From: Raghu Vatsavayi <raghu.vatsavayi@cavium.com> > > NIC firmware does not support disabling rx vlan offload, but the VF driver > incorrectly indicates that it is supported. The PF driver already does the > correct indication by clearing the NETIF_F_HW_VLAN_CTAG_RX bit in its > netdev->hw_features. So just do the same thing in the VF. > > Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@cavium.com> > Acked-by: Prasad Kanneganti <prasad.kanneganti@cavium.com> > Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com> Applied, thanks.
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 08b682b..6295eee 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -2100,6 +2100,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) netdev->features = (lio->dev_capability & ~NETIF_F_LRO); netdev->hw_features = lio->dev_capability; + netdev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX; /* MTU range: 68 - 16000 */ netdev->min_mtu = LIO_MIN_MTU_SIZE;