From 1847864fd5c8cab3392af10319ddb6a626902074 Mon Sep 17 00:00:00 2001
From: Jesse Gross <jesse@nicira.com>
Date: Thu, 21 Oct 2010 11:30:43 +0000
Subject: [PATCH] --- yaml --- r: 215525 b: refs/heads/master c:
 ec37a48d1d16c30b655ac5280209edf52a6775d4 h: refs/heads/master i:   215523:
 38ec20f8c7df76440ec1d44cd2baa472700bca3b v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/bnx2.c                | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_ethtool.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4e109365d2fa..1121cc8776b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0988c4c7fb5881377ec20a6452f739a722e97c6b
+refs/heads/master: ec37a48d1d16c30b655ac5280209edf52a6775d4
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index bf3c830e7dda..062600be073b 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7528,7 +7528,7 @@ bnx2_set_flags(struct net_device *dev, u32 data)
 
 	if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) &&
 	    !(data & ETH_FLAG_RXVLAN))
-		return -EOPNOTSUPP;
+		return -EINVAL;
 
 	rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN |
 				  ETH_FLAG_TXVLAN);
diff --git a/trunk/drivers/net/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
index daefef618ef7..d02ffbdc9f0e 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1123,7 +1123,7 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
 	}
 
 	if (!(data & ETH_FLAG_RXVLAN))
-		return -EOPNOTSUPP;
+		return -EINVAL;
 
 	if ((data & ETH_FLAG_LRO) && bp->rx_csum && bp->disable_tpa)
 		return -EINVAL;