diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-15 15:25:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-15 15:25:19 -0500 |
| commit | f878b995b0f746f5726af9e66940f3bf373dae91 (patch) | |
| tree | 81fa0cc358ff9957116468a0c37d4f7f3f493cb3 /net/core | |
| parent | 29e1846a6ba84e0c6e257dd5b1231ed53b98fe9b (diff) | |
| parent | 94b274bf5fba6c75b922c8a23ad4b5639a168780 (diff) | |
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 a4132766d363..4580460ebecd 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) | |||
| 1648 | if (txq < 1 || txq > dev->num_tx_queues) | 1648 | if (txq < 1 || txq > dev->num_tx_queues) |
| 1649 | return -EINVAL; | 1649 | return -EINVAL; |
| 1650 | 1650 | ||
| 1651 | if (dev->reg_state == NETREG_REGISTERED) { | 1651 | if (dev->reg_state == NETREG_REGISTERED || |
| 1652 | dev->reg_state == NETREG_UNREGISTERING) { | ||
| 1652 | ASSERT_RTNL(); | 1653 | ASSERT_RTNL(); |
| 1653 | 1654 | ||
| 1654 | rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues, | 1655 | rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues, |