diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /net/sched/sch_generic.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index a854cab03f1e..c84b65920d1b 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -844,6 +844,7 @@ void dev_deactivate(struct net_device *dev) | |||
| 844 | 844 | ||
| 845 | list_add(&dev->unreg_list, &single); | 845 | list_add(&dev->unreg_list, &single); |
| 846 | dev_deactivate_many(&single); | 846 | dev_deactivate_many(&single); |
| 847 | list_del(&single); | ||
| 847 | } | 848 | } |
| 848 | EXPORT_SYMBOL(dev_deactivate); | 849 | EXPORT_SYMBOL(dev_deactivate); |
| 849 | 850 | ||