From: Florian Westphal <fw@strlen.de>
To: Ivan Vecera <ivecera@redhat.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net, rmody@brocade.com,
jiri@resnulli.us
Subject: Re: [PATCH net] bna: fix vlan tag stripping and implement its toggling
Date: Fri, 28 Feb 2014 10:42:03 +0100 [thread overview]
Message-ID: <20140228094203.GA22153@breakpoint.cc> (raw)
In-Reply-To: <1393578674-12658-1-git-send-email-ivecera@redhat.com>
Ivan Vecera <ivecera@redhat.com> wrote:
> diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
> index cf64f3d..bc09056 100644
> --- a/drivers/net/ethernet/brocade/bna/bnad.c
> +++ b/drivers/net/ethernet/brocade/bna/bnad.c
> @@ -707,7 +707,8 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)
> else
> skb_checksum_none_assert(skb);
>
> - if (flags & BNA_CQ_EF_VLAN)
> + if ((flags & BNA_CQ_EF_VLAN) &&
> + (bnad->netdev->features & NETIF_F_HW_VLAN_CTAG_RX))
> __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(cmpl->vlan_tag));
>
> if (BNAD_RXBUF_IS_SK_BUFF(unmap_q->type))
> @@ -3245,11 +3246,6 @@ bnad_set_rx_mode(struct net_device *netdev)
> BNA_RXMODE_ALLMULTI;
> bna_rx_mode_set(bnad->rx_info[0].rx, new_mode, mode_mask, NULL);
>
> - if (bnad->cfg_flags & BNAD_CF_PROMISC)
> - bna_rx_vlan_strip_disable(bnad->rx_info[0].rx);
> - else
> - bna_rx_vlan_strip_enable(bnad->rx_info[0].rx);
> -
> spin_unlock_irqrestore(&bnad->bna_lock, flags);
> }
>
> @@ -3374,6 +3370,27 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
> return 0;
> }
>
> +int bnad_set_features(struct net_device *dev, netdev_features_t features)
> +{
Nit: static?
next prev parent reply other threads:[~2014-02-28 9:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 9:11 [PATCH net] bna: fix vlan tag stripping and implement its toggling Ivan Vecera
2014-02-28 9:24 ` Jiri Pirko
2014-02-28 9:53 ` Ivan Vecera
2014-02-28 9:42 ` Florian Westphal [this message]
2014-02-28 9:48 ` Ivan Vecera
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=20140228094203.GA22153@breakpoint.cc \
--to=fw@strlen.de \
--cc=davem@davemloft.net \
--cc=ivecera@redhat.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=rmody@brocade.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).