---

yaml --- r: 214793 b: refs/heads/master c: 5df8dbd h: refs/heads/master i: 214791: 6ad6af4 v: v3
git-mirror · Sep 28, 2010 · f6f07e7 · f6f07e7
1 parent 8986552
commit f6f07e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f4adc7b7e03f9c0bfc81fccc8ad85d06dc8d88
+refs/heads/master: 5df8dbd7e517b581e0b8cbd72a99da17914a20b0
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -321,7 +321,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
 	if (new_dev == NULL)
 		return -ENOBUFS;
 
-	new_dev->real_num_tx_queues = real_dev->real_num_tx_queues;
+	netif_copy_real_num_queues(new_dev, real_dev);
 	dev_net_set(new_dev, net);
 	/* need 4 bytes for extra VLAN header info,
 	 * hope the underlying device can handle it.