diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /net/sched | |
| parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 0834c2ee9174..6f9151899795 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -238,9 +238,7 @@ void __netdev_watchdog_up(struct net_device *dev) | |||
| 238 | 238 | ||
| 239 | static void dev_watchdog_up(struct net_device *dev) | 239 | static void dev_watchdog_up(struct net_device *dev) |
| 240 | { | 240 | { |
| 241 | netif_tx_lock_bh(dev); | ||
| 242 | __netdev_watchdog_up(dev); | 241 | __netdev_watchdog_up(dev); |
| 243 | netif_tx_unlock_bh(dev); | ||
| 244 | } | 242 | } |
| 245 | 243 | ||
| 246 | static void dev_watchdog_down(struct net_device *dev) | 244 | static void dev_watchdog_down(struct net_device *dev) |