From: Patrick McHardy <kaber@trash.net>
To: eilong@broadcom.com
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Gerlitz <ogerlitz@Voltaire.com>
Subject: Re: [net-next 6/10] bnx2x: Update vlan_features
Date: Thu, 23 Jul 2009 12:46:27 +0200 [thread overview]
Message-ID: <4A683F83.1060701@trash.net> (raw)
In-Reply-To: <1248191263.18195.49.camel@lb-tlvb-eilong>
Eilon Greenstein wrote:
> As noted by Or Gerlitz <ogerlitz@Voltaire.com>, the vlan_features was not
> updated
>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> ---
> drivers/net/bnx2x_main.c | 19 +++++++++++++++++--
> 1 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
> index 18c3803..b404a9b 100644
> --- a/drivers/net/bnx2x_main.c
> +++ b/drivers/net/bnx2x_main.c
> @@ -9310,9 +9310,17 @@ static int bnx2x_set_tso(struct net_device *dev, u32 data)
> if (data) {
> dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
> dev->features |= NETIF_F_TSO6;
> +#ifdef BCM_VLAN
> + dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
> + dev->vlan_features |= NETIF_F_TSO6;
> +#endif
> } else {
> dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
> dev->features &= ~NETIF_F_TSO6;
> +#ifdef BCM_VLAN
> + dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
> + dev->vlan_features &= ~NETIF_F_TSO6;
> +#endif
vlan_features doesn't need to be updated, the resulting dev->features
of the VLAN device is computed as the intersection of dev->features
and dev->vlan_features.
next prev parent reply other threads:[~2009-07-23 10:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-21 15:47 [net-next 6/10] bnx2x: Update vlan_features Eilon Greenstein
2009-07-23 10:46 ` Patrick McHardy [this message]
2009-07-23 11:14 ` Or Gerlitz
2009-07-23 11:21 ` Patrick McHardy
2009-07-23 11:30 ` Or Gerlitz
2009-07-23 18:47 ` Jay Vosburgh
2009-07-24 19:47 ` Jay Vosburgh
2009-08-26 14:18 ` Or Gerlitz
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=4A683F83.1060701@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@Voltaire.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).