diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/sched/sch_generic.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 99ceb91f0150..31eb83717c26 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -234,7 +234,7 @@ static void dev_watchdog_down(struct net_device *dev) | |||
| 234 | { | 234 | { |
| 235 | spin_lock_bh(&dev->xmit_lock); | 235 | spin_lock_bh(&dev->xmit_lock); |
| 236 | if (del_timer(&dev->watchdog_timer)) | 236 | if (del_timer(&dev->watchdog_timer)) |
| 237 | __dev_put(dev); | 237 | dev_put(dev); |
| 238 | spin_unlock_bh(&dev->xmit_lock); | 238 | spin_unlock_bh(&dev->xmit_lock); |
| 239 | } | 239 | } |
| 240 | 240 | ||