| Message ID | 1474991638-10666-1-git-send-email-fw@strlen.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Sep 27, 2016 at 05:53:58PM +0200, Florian Westphal wrote: > Not used anymore since 2009 (9e0d57fd6dad37, > 'xfrm: SAD entries do not expire correctly after suspend-resume'). > > Signed-off-by: Florian Westphal <fw@strlen.de> Applied to ipsec-next, thanks!
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index bf5969aa7dc2..9ca9a30c3fcf 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -388,14 +388,6 @@ static void xfrm_state_gc_task(struct work_struct *work) xfrm_state_gc_destroy(x); } -static inline unsigned long make_jiffies(long secs) -{ - if (secs >= (MAX_SCHEDULE_TIMEOUT-1)/HZ) - return MAX_SCHEDULE_TIMEOUT-1; - else - return secs*HZ; -} - static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me) { struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);
Not used anymore since 2009 (9e0d57fd6dad37, 'xfrm: SAD entries do not expire correctly after suspend-resume'). Signed-off-by: Florian Westphal <fw@strlen.de> --- net/xfrm/xfrm_state.c | 8 -------- 1 file changed, 8 deletions(-)