lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 28 Feb 2014 10:42:03 +0100 From: Florian Westphal <fw@...len.de> To: Ivan Vecera <ivecera@...hat.com> Cc: netdev@...r.kernel.org, davem@...emloft.net, rmody@...cade.com, jiri@...nulli.us Subject: Re: [PATCH net] bna: fix vlan tag stripping and implement its toggling Ivan Vecera <ivecera@...hat.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? -- 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