From b0731ba60b07a61cfbeb376db4d447be464fd42b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 27 Sep 2010 08:30:05 +0000
Subject: [PATCH] --- yaml --- r: 214789 b: refs/heads/master c:
 206d6b3270921fe4a207515beb1f7f7cd8aa3597 h: refs/heads/master i:   214787:
 40b9f4551e570b6b75d3e607513440bab8ee1f4e v: v3

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

diff --git a/[refs] b/[refs]
index 02b61029927b..370ea17fcc47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1eb63a28148336b8a97ff5ee0ecd6830e76a7044
+refs/heads/master: 206d6b3270921fe4a207515beb1f7f7cd8aa3597
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 2d488abcf62d..dd2b6a71c6d7 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -2901,7 +2901,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 	mp->dev = dev;
 
 	set_params(mp, pd);
-	dev->real_num_tx_queues = mp->txq_count;
+	netif_set_real_num_tx_queues(dev, mp->txq_count);
+	netif_set_real_num_rx_queues(dev, mp->rxq_count);
 
 	if (pd->phy_addr != MV643XX_ETH_PHY_NONE)
 		mp->phy = phy_scan(mp, pd->phy_addr);