[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <BANLkTikiZmj42XXeBTNBgpbEWiqFRasV6w@mail.gmail.com>
Date: Wed, 29 Jun 2011 13:06:25 +0200
From: Michał Mirosław <mirqus@...il.com>
To: Jesse Gross <jesse@...ira.com>
Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
Shreyas Bhatewara <sbhatewara@...are.com>,
VMware PV-Drivers <pv-drivers@...are.com>
Subject: Re: [PATCH] vmxnet3: Convert to new vlan model.
2011/6/24 Jesse Gross <jesse@...ira.com>:
> This converts the vmxnet3 driver to use the new vlan model. In doing so
> it fixes missing tags in tcpdump and failure to do checksum offload when
> tx vlan offload is disabled.
[...]
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
[...]
> @@ -2639,12 +2588,13 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter, bool dma64)
>
> netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
> NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX |
> - NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_LRO;
> + NETIF_F_HW_VLAN_RX | NETIF_F_TSO | NETIF_F_TSO6 |
> + NETIF_F_LRO;
> if (dma64)
> netdev->features |= NETIF_F_HIGHDMA;
***
> - netdev->vlan_features = netdev->hw_features & ~NETIF_F_HW_VLAN_TX;
> - netdev->features = netdev->hw_features |
> - NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
> + netdev->vlan_features = netdev->hw_features &
> + ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
> + netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER;
This will disable NETIF_F_HIGHDMA even if dma64 == true. I propose a
fix that sets NETIF_F_HIGHDMA
in hw_features instead of features at line before '***' mark.
Best Regards,
Michał Mirosław
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists