aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2010-10-20 09:56:03 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-21 04:26:52 -0400
commiteab6d18d20fc5b5ba04a7e7fcd6f357197870e51 (patch)
tree8a52538666747998dd16bc68a2102b05ebfe6873 /drivers/net/cxgb3
parentb738127dfb469bb9f595cdace30e7f881e8146b2 (diff)
vlan: Don't check for vlan group before vlan_tx_tag_present.
Many (but not all) drivers check to see whether there is a vlan group configured before using a tag stored in the skb. There's not much point in this check since it just throws away data that should only be present in the expected circumstances. However, it will soon be legal and expected to get a vlan tag when no vlan group is configured, so remove this check from all drivers to avoid dropping the tags. Signed-off-by: Jesse Gross <jesse@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r--drivers/net/cxgb3/sge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index c5a142bea5e9..7ad4625dac62 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1145,7 +1145,7 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
1145 cpl->len = htonl(skb->len); 1145 cpl->len = htonl(skb->len);
1146 cntrl = V_TXPKT_INTF(pi->port_id); 1146 cntrl = V_TXPKT_INTF(pi->port_id);
1147 1147
1148 if (vlan_tx_tag_present(skb) && pi->vlan_grp) 1148 if (vlan_tx_tag_present(skb))
1149 cntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(vlan_tx_tag_get(skb)); 1149 cntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(vlan_tx_tag_get(skb));
1150 1150
1151 tso_info = V_LSO_MSS(skb_shinfo(skb)->gso_size); 1151 tso_info = V_LSO_MSS(skb_shinfo(skb)->gso_size);
@@ -1279,7 +1279,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1279 qs->port_stats[SGE_PSTAT_TX_CSUM]++; 1279 qs->port_stats[SGE_PSTAT_TX_CSUM]++;
1280 if (skb_shinfo(skb)->gso_size) 1280 if (skb_shinfo(skb)->gso_size)
1281 qs->port_stats[SGE_PSTAT_TSO]++; 1281 qs->port_stats[SGE_PSTAT_TSO]++;
1282 if (vlan_tx_tag_present(skb) && pi->vlan_grp) 1282 if (vlan_tx_tag_present(skb))
1283 qs->port_stats[SGE_PSTAT_VLANINS]++; 1283 qs->port_stats[SGE_PSTAT_VLANINS]++;
1284 1284
1285 /* 1285 /*