diff --git a/[refs] b/[refs]
index 3cd92172486b..b1c6aeea7d6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7c7d01aaed1f71d9afe815a569f0a81465a1744
+refs/heads/master: 7c8104774e59549c37dd1cb0a8ec4f131094664c
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index df99edf3464a..99e7652e2169 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7553,6 +7553,10 @@ bnx2_set_flags(struct net_device *dev, u32 data)
 	    !(data & ETH_FLAG_RXVLAN))
 		return -EINVAL;
 
+	/* TSO with VLAN tag won't work with current firmware */
+	if (!(data & ETH_FLAG_TXVLAN))
+		return -EINVAL;
+
 	rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN |
 				  ETH_FLAG_TXVLAN);
 	if (rc)