netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ixgb: Don't check for vlan group on transmit.
@ 2010-10-30 18:49 Jesse Gross
  2010-10-30 18:49 ` [PATCH 2/2] igb: Don't depend on vlan group for receive size Jesse Gross
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Jesse Gross @ 2010-10-30 18:49 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, Jeff Kirsher, Jesse Brandeburg, PJ Waskiewicz

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@nicira.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2010-12-01 17:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-30 18:49 [PATCH 1/2] ixgb: Don't check for vlan group on transmit Jesse Gross
2010-10-30 18:49 ` [PATCH 2/2] igb: Don't depend on vlan group for receive size Jesse Gross
2010-11-03 14:55   ` Jeff Kirsher
2010-11-03 14:55 ` [PATCH 1/2] ixgb: Don't check for vlan group on transmit Jeff Kirsher
2010-11-05 19:11 ` Jeff Kirsher
2010-11-05 19:56   ` Jesse Gross
2010-11-05 20:06     ` Jeff Kirsher
2010-11-05 22:30       ` Duyck, Alexander H
2010-11-08 19:59         ` Jesse Gross
2010-11-30 22:33           ` Jesse Gross
2010-11-30 22:52             ` Tantilov, Emil S
2010-12-01 17:40             ` Duyck, Alexander H

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).