aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-09-27 04:32:59 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-28 01:09:57 -0400
commit5df8dbd7e517b581e0b8cbd72a99da17914a20b0 (patch)
tree65b1a3390fcc1106adb18a252637f226e7bc2491
parentc4f4adc7b7e03f9c0bfc81fccc8ad85d06dc8d88 (diff)
8021q: Use netif_copy_real_num_queues() to set queue counts
This covers RX if necessary, as well as TX. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/8021q/vlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 2c6c2bd6e4a9..25c21332e9c3 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -321,7 +321,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
321 if (new_dev == NULL) 321 if (new_dev == NULL)
322 return -ENOBUFS; 322 return -ENOBUFS;
323 323
324 new_dev->real_num_tx_queues = real_dev->real_num_tx_queues; 324 netif_copy_real_num_queues(new_dev, real_dev);
325 dev_net_set(new_dev, net); 325 dev_net_set(new_dev, net);
326 /* need 4 bytes for extra VLAN header info, 326 /* need 4 bytes for extra VLAN header info,
327 * hope the underlying device can handle it. 327 * hope the underlying device can handle it.