From: "Michał Mirosław" <mirqus@gmail.com>
To: Jesse Gross <jesse@nicira.com>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Shreyas Bhatewara <sbhatewara@vmware.com>,
VMware PV-Drivers <pv-drivers@vmware.com>
Subject: Re: [PATCH] vmxnet3: Convert to new vlan model.
Date: Wed, 29 Jun 2011 13:06:25 +0200 [thread overview]
Message-ID: <BANLkTikiZmj42XXeBTNBgpbEWiqFRasV6w@mail.gmail.com> (raw)
In-Reply-To: <1308870279-30773-1-git-send-email-jesse@nicira.com>
2011/6/24 Jesse Gross <jesse@nicira.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
prev parent reply other threads:[~2011-06-29 11:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 23:04 [PATCH] vmxnet3: Convert to new vlan model Jesse Gross
2011-06-25 1:42 ` [Pv-drivers] " Scott Goldman
2011-06-28 3:57 ` David Miller
2011-06-29 11:06 ` Michał Mirosław [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTikiZmj42XXeBTNBgpbEWiqFRasV6w@mail.gmail.com \
--to=mirqus@gmail.com \
--cc=davem@davemloft.net \
--cc=jesse@nicira.com \
--cc=netdev@vger.kernel.org \
--cc=pv-drivers@vmware.com \
--cc=sbhatewara@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).