diff options
| author | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
| commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
| tree | 7362b182dedd825fc762ef7706830837e42943af /net/8021q/vlan.c | |
| parent | 225a9be24d799aa16d543c31fb09f0c9ed1d9caa (diff) | |
| parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 453512266ea1..db783d7af5a3 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
| @@ -378,6 +378,8 @@ static void vlan_transfer_features(struct net_device *dev, | |||
| 378 | #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) | 378 | #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) |
| 379 | vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid; | 379 | vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid; |
| 380 | #endif | 380 | #endif |
| 381 | vlandev->real_num_tx_queues = dev->real_num_tx_queues; | ||
| 382 | BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues); | ||
| 381 | 383 | ||
| 382 | if (old_features != vlandev->features) | 384 | if (old_features != vlandev->features) |
| 383 | netdev_features_change(vlandev); | 385 | netdev_features_change(vlandev); |