Re: [BUG] bnx2 + vlan + TSO : doesnt work
flat view
From: Ben Hutchings <hidden>
Date: 2011-01-18 00:09:28
On Tue, 2011-01-18 at 01:00 +0100, Eric Dumazet wrote:
Le lundi 17 janvier 2011 à 23:47 +0000, Ben Hutchings a écrit :quoted
On Tue, 2011-01-18 at 00:41 +0100, Eric Dumazet wrote:quoted
Oh well, my dev machine, with bnx2 and tg3 NICs, isnt working at all with current linux-2.6 tree (I need vlans on my setup) tg3 : vlan not working bnx2 : vlan + TSO not working (or very slowly, since only non GSO frames are OK) I suspect recent commits from Jesse are the problem. (bnx2_xmit() is feeded with zeroed vlan_tci skbs) Maybe f01a5236bd4b1401 (net offloading: Generalize netif_get_vlan_features().) ? I dont see NETIF_F_HW_VLAN_TX being set in vlan_features in net drivers. They only set this flag in dev->features I dont think changing all drivers to also set vlan_features makes sense. Is following patch the right path ? (It does solve my problem)This isn't right. NETIF_F_HW_VLAN_TX in vlan_features would mean that the hardware can do two levels of VLAN tag insertion, which is generally not true.So should we revert part of Jesse patch ? I want my vlan back ;)
Yeah, that looks right. Ben.
quoted hunk ↗ jump to hunk
diff --git a/net/core/dev.c b/net/core/dev.c index 54277df..8209d93 100644 --- a/net/core/dev.c +++ b/net/core/dev.c@@ -2076,7 +2076,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, features = netif_skb_features(skb); if (vlan_tx_tag_present(skb) && - !(features & NETIF_F_HW_VLAN_TX)) { + !(dev->features & NETIF_F_HW_VLAN_TX)) { skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb)); if (unlikely(!skb)) goto out;
-- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.