[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1288464591-31528-1-git-send-email-jesse@nicira.com>
Date: Sat, 30 Oct 2010 11:49:50 -0700
From: Jesse Gross <jesse@...ira.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org, Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
Jesse Brandeburg <jesse.brandeburg@...el.com>,
PJ Waskiewicz <peter.p.waskiewicz.jr@...el.com>
Subject: [PATCH 1/2] ixgb: Don't check for vlan group on transmit.
On transmit, the ixgb driver will only use vlan acceleration if a
vlan group is configured. This can lead to tags getting dropped
when bridging because the networking core assumes that a driver
that claims vlan acceleration support can do it at all times. This
change should have been part of commit eab6d18d "vlan: Don't check for
vlan group before vlan_tx_tag_present." but was missed.
Signed-off-by: Jesse Gross <jesse@...ira.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
CC: Jesse Brandeburg <jesse.brandeburg@...el.com>
CC: PJ Waskiewicz <peter.p.waskiewicz.jr@...el.com>
---
drivers/net/ixgb/ixgb_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index caa8192..d18194e 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1498,7 +1498,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
DESC_NEEDED)))
return NETDEV_TX_BUSY;
- if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+ if (vlan_tx_tag_present(skb)) {
tx_flags |= IXGB_TX_FLAGS_VLAN;
vlan_id = vlan_tx_tag_get(skb);
}
--
1.7.1
--
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