diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /net/ipv4/inetpeer.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'net/ipv4/inetpeer.c')
| -rw-r--r-- | net/ipv4/inetpeer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index f84ba9c96551..2fc3fd38924f 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
| @@ -100,8 +100,7 @@ DEFINE_SPINLOCK(inet_peer_unused_lock); | |||
| 100 | #define PEER_MAX_CLEANUP_WORK 30 | 100 | #define PEER_MAX_CLEANUP_WORK 30 |
| 101 | 101 | ||
| 102 | static void peer_check_expire(unsigned long dummy); | 102 | static void peer_check_expire(unsigned long dummy); |
| 103 | static struct timer_list peer_periodic_timer = | 103 | static DEFINE_TIMER(peer_periodic_timer, peer_check_expire, 0, 0); |
| 104 | TIMER_INITIALIZER(peer_check_expire, 0, 0); | ||
| 105 | 104 | ||
| 106 | /* Exported for sysctl_net_ipv4. */ | 105 | /* Exported for sysctl_net_ipv4. */ |
| 107 | int inet_peer_gc_mintime = 10 * HZ, | 106 | int inet_peer_gc_mintime = 10 * HZ, |