diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-15 12:25:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-15 12:25:19 -0800 |
| commit | f878b995b0f746f5726af9e66940f3bf373dae91 (patch) | |
| tree | 81fa0cc358ff9957116468a0c37d4f7f3f493cb3 /net/core | |
| parent | 29e1846a6ba84e0c6e257dd5b1231ed53b98fe9b (diff) | |
| parent | 94b274bf5fba6c75b922c8a23ad4b5639a168780 (diff) | |
| download | kernel_samsung_aries-f878b995b0f746f5726af9e66940f3bf373dae91.zip kernel_samsung_aries-f878b995b0f746f5726af9e66940f3bf373dae91.tar.gz kernel_samsung_aries-f878b995b0f746f5726af9e66940f3bf373dae91.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a413276..4580460 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1648,7 +1648,8 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq) if (txq < 1 || txq > dev->num_tx_queues) return -EINVAL; - if (dev->reg_state == NETREG_REGISTERED) { + if (dev->reg_state == NETREG_REGISTERED || + dev->reg_state == NETREG_UNREGISTERING) { ASSERT_RTNL(); rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues, |