diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/core/link_watch.c | |
parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/core/link_watch.c')
-rw-r--r-- | net/core/link_watch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index 549a2ce951b..8b45c9d3b24 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c | |||
@@ -124,7 +124,7 @@ void linkwatch_run_queue(void) | |||
124 | 124 | ||
125 | dev_put(dev); | 125 | dev_put(dev); |
126 | } | 126 | } |
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
130 | static void linkwatch_event(struct work_struct *dummy) | 130 | static void linkwatch_event(struct work_struct *dummy) |
@@ -133,7 +133,7 @@ static void linkwatch_event(struct work_struct *dummy) | |||
133 | * per second so that a runaway driver does not | 133 | * per second so that a runaway driver does not |
134 | * cause a storm of messages on the netlink | 134 | * cause a storm of messages on the netlink |
135 | * socket | 135 | * socket |
136 | */ | 136 | */ |
137 | linkwatch_nextevent = jiffies + HZ; | 137 | linkwatch_nextevent = jiffies + HZ; |
138 | clear_bit(LW_RUNNING, &linkwatch_flags); | 138 | clear_bit(LW_RUNNING, &linkwatch_flags); |
139 | 139 | ||