projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlan: Don't check for vlan group before vlan_tx_tag_present.
[deliverable/linux.git]
/
drivers
/
net
/
bnx2x
/
bnx2x_cmn.c
diff --git
a/drivers/net/bnx2x/bnx2x_cmn.c
b/drivers/net/bnx2x/bnx2x_cmn.c
index 1966ceeefcd4980d1ff11b25e780348c7244cdda..6905b2e0609e0d9b26bdb90e14118555e9cb12c7 100644
(file)
--- a/
drivers/net/bnx2x/bnx2x_cmn.c
+++ b/
drivers/net/bnx2x/bnx2x_cmn.c
@@
-2026,8
+2026,7
@@
netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
pkt_prod, tx_buf, fp->tx_pkt_prod, bd_prod, tx_start_bd);
#ifdef BCM_VLAN
pkt_prod, tx_buf, fp->tx_pkt_prod, bd_prod, tx_start_bd);
#ifdef BCM_VLAN
- if ((bp->vlgrp != NULL) && vlan_tx_tag_present(skb) &&
- (bp->flags & HW_VLAN_TX_FLAG)) {
+ if (vlan_tx_tag_present(skb)) {
tx_start_bd->vlan_or_ethertype =
cpu_to_le16(vlan_tx_tag_get(skb));
tx_start_bd->bd_flags.as_bitfield |=
tx_start_bd->vlan_or_ethertype =
cpu_to_le16(vlan_tx_tag_get(skb));
tx_start_bd->bd_flags.as_bitfield |=
This page took
0.024506 seconds
and
5
git commands to generate.