---

yaml --- r: 203214 b: refs/heads/master c: e0d904f h: refs/heads/master v: v3
git-mirror · Jun 29, 2010 · 2f45b6e · 2f45b6e
1 parent c1ae4bb
commit 2f45b6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d92be4b1661be0cef5f277f10078c71c166f16ad
+refs/heads/master: e0d904ffd052930504913fb105dd25764f5f0bd8
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
@@ -10982,6 +10982,9 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
 	int changed = 0;
 	int rc = 0;
 
+	if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH))
+		return -EOPNOTSUPP;
+
 	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
 		printk(KERN_ERR "Handling parity error recovery. Try again later\n");
 		return -EAGAIN;