From f91a31cdbd2a18efdc343482e29509dba647e467 Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Wed, 6 Oct 2010 23:35:15 -0700
Subject: [PATCH] --- yaml --- r: 214963 b: refs/heads/master c:
 3d3211ef5cf7558d289d1a1efbef8c45595639aa h: refs/heads/master i:   214961:
 973b483da861712ca8fd0c01b3f934ff5f174aec   214959:
 e0f14204563e7252e259344eb578a914607d7403 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c313b7c9f4e8..f128162722d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2dddf941409635601e56c1990c5ab0bd395742c
+refs/heads/master: 3d3211ef5cf7558d289d1a1efbef8c45595639aa
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 7d149550e8d6..fd1b75a47e88 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1593,8 +1593,6 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
 						  rxq);
 		if (rc)
 			return rc;
-	} else {
-		dev->num_rx_queues = rxq;
 	}
 
 	dev->real_num_rx_queues = rxq;