diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-05 12:21:09 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-05 12:21:09 +0900 |
| commit | 94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7 (patch) | |
| tree | 445ff43779938b539e0799e81c90b85bbee552cd /net/8021q/vlan.c | |
| parent | 720fcb36ac1aa2df2c54c170253b6b29600cbefc (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
| download | op-kernel-dev-94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7.zip op-kernel-dev-94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7.tar.gz | |
Merge branch 'sh/stable-updates'
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 4535122..db783d7 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -378,6 +378,8 @@ static void vlan_transfer_features(struct net_device *dev, #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid; #endif + vlandev->real_num_tx_queues = dev->real_num_tx_queues; + BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues); if (old_features != vlandev->features) netdev_features_change(vlandev); |
