From 37746227463dab6ac8c840dc0b23c7dd12723a59 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 27 Sep 2010 08:25:57 +0000
Subject: [PATCH] --- yaml --- r: 214783 b: refs/heads/master c:
 a020ed4bb88356fea9e24ffcfd9692a835a3f122 h: refs/heads/master i:   214781:
 c5edde1b771f1a88cd1723e27b2b79963b9d7479   214779:
 cb4583fcefe906aee9488851d3ba2bc0dd3a129b   214775:
 f5481b7871ef3a8a02358b9beef4ff0d86c32206   214767:
 4bad590d60ab6f66d412a6a930d585f555397bd6   214751:
 5297b904cb1bdd59023b9587f85d346245b04826   214719:
 d701dc223de6e3d6ff9fd023633599e3b4782790   214655:
 54088f2940d5e768919f4cbb6c1791a679577c9e   214527:
 28ce22c8619e065e2e1eaf3035bfb9fea95a688d v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/cxgb4/cxgb4_main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9b8e920f7a2..3ba7b5122918 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19221e75da32cecbd3fe83a8ac12755fe38a4602
+refs/heads/master: a020ed4bb88356fea9e24ffcfd9692a835a3f122
diff --git a/trunk/drivers/net/cxgb4/cxgb4_main.c b/trunk/drivers/net/cxgb4/cxgb4_main.c
index 75b9401fd484..4fb08e3c3f38 100644
--- a/trunk/drivers/net/cxgb4/cxgb4_main.c
+++ b/trunk/drivers/net/cxgb4/cxgb4_main.c
@@ -2763,7 +2763,10 @@ static int cxgb_open(struct net_device *dev)
 			return err;
 	}
 
-	dev->real_num_tx_queues = pi->nqsets;
+	netif_set_real_num_tx_queues(dev, pi->nqsets);
+	err = netif_set_real_num_rx_queues(dev, pi->nqsets);
+	if (err)
+		return err;
 	err = link_start(dev);
 	if (!err)
 		netif_tx_start_all_queues(dev);