From 38bfc7a552fb9edec767ca7c5ce41d5d88f96b86 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 23 Jul 2009 21:21:19 +0000
Subject: [PATCH] --- yaml --- r: 159197 b: refs/heads/master c:
 7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20 h: refs/heads/master i:   159195:
 ed510834ef1730562c2fd55c4191f96224722691 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x_main.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 955269e5b955..2bd93c7d3196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5eb0589937eae2d58fca17fa45ed44152e772ed
+refs/heads/master: 7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index c4c42b38bbbe..a2de0cd9c9f9 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x_main.c
@@ -9349,17 +9349,9 @@ static int bnx2x_set_tso(struct net_device *dev, u32 data)
 	if (data) {
 		dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
 		dev->features |= NETIF_F_TSO6;
-#ifdef BCM_VLAN
-		dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
-		dev->vlan_features |= NETIF_F_TSO6;
-#endif
 	} else {
 		dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
 		dev->features &= ~NETIF_F_TSO6;
-#ifdef BCM_VLAN
-		dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
-		dev->vlan_features &= ~NETIF_F_TSO6;
-#endif
 	}
 
 	return 0;