diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-07-12 10:23:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-07-12 10:23:25 -0700 |
| commit | 1b4e3e1db6114d919a0d15fbf7dfcdec93ee8ca8 (patch) | |
| tree | b5ed2f3a8340dcaeffd43cbdaa4813cf8b236f23 /include/net | |
| parent | 08dbab2c33140de90c7b3d4291c90195fb6824de (diff) | |
[IPV4]: Kill slow timers from IPVS, they are superfluous and inefficient these days.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 772d67c971f5..92336b4d945c 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -408,17 +408,6 @@ union ip_vs_tphdr { /* - * Slow timer for IPVS connections - */ -struct sltimer_list { - struct list_head list; - unsigned long expires; - unsigned long data; - void (*function)(unsigned long); -}; - - -/* * Delta sequence info structure * Each ip_vs_conn has 2 (output AND input seq. changes). * Only used in the VS/NAT. @@ -535,7 +524,7 @@ struct ip_vs_conn { /* counter and timer */ atomic_t refcnt; /* reference count */ - struct sltimer_list timer; /* Expiration timer */ + struct timer_list timer; /* Expiration timer */ volatile unsigned long timeout; /* timeout */ /* Flags and state transition */ @@ -939,27 +928,6 @@ extern int ip_vs_new_estimator(struct ip_vs_stats *stats); extern void ip_vs_kill_estimator(struct ip_vs_stats *stats); extern void ip_vs_zero_estimator(struct ip_vs_stats *stats); - -/* - * Slow timer functions for IPVS - * (from ip_vs_timer.c) - */ -extern void add_sltimer(struct sltimer_list *timer); -extern int del_sltimer(struct sltimer_list *timer); -extern void mod_sltimer(struct sltimer_list *timer, unsigned long expires); -extern void ip_vs_sltimer_init(void); -extern void ip_vs_sltimer_cleanup(void); -static inline void init_sltimer(struct sltimer_list *timer) -{ - timer->list.next = timer->list.prev = NULL; -} - -static inline int sltimer_pending(const struct sltimer_list *timer) -{ - return timer->list.next != NULL; -} - - /* * Various IPVS packet transmitters (from ip_vs_xmit.c) */ |