diff options
| author | Vasu Dev <vasu.dev@intel.com> | 2010-03-23 14:42:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-24 11:11:38 -0700 |
| commit | f6b9f4b263f3178fc0f23f0e67d04386528cc727 (patch) | |
| tree | 6f749e6baeaf910ff53a9dfa0075dfbd5c856ddd | |
| parent | 669d3e0babb40018dd6e78f4093c13a2eac73866 (diff) | |
| download | kernel_samsung_smdk4412-f6b9f4b263f3178fc0f23f0e67d04386528cc727.zip kernel_samsung_smdk4412-f6b9f4b263f3178fc0f23f0e67d04386528cc727.tar.gz kernel_samsung_smdk4412-f6b9f4b263f3178fc0f23f0e67d04386528cc727.tar.bz2 | |
vlan: updates vlan real_num_tx_queues
Updates real_num_tx_queues in case underlying real device
has changed real_num_tx_queues.
-v2
As per Eric Dumazet<eric.dumazet@gmail.com> comment:-
-- adds BUG_ON to catch case of real_num_tx_queues exceeding num_tx_queues.
-- created this self contained patch to just update real_num_tx_queues.
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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); |