* [PATCH ipsec-next] xfrm: remove unused helper
@ 2016-09-27 15:53 Florian Westphal
2016-09-30 7:26 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2016-09-27 15:53 UTC (permalink / raw)
To: netdev; +Cc: Florian Westphal
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(-)
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);
--
2.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH ipsec-next] xfrm: remove unused helper
2016-09-27 15:53 [PATCH ipsec-next] xfrm: remove unused helper Florian Westphal
@ 2016-09-30 7:26 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2016-09-30 7:26 UTC (permalink / raw)
To: Florian Westphal; +Cc: netdev
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-30 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-27 15:53 [PATCH ipsec-next] xfrm: remove unused helper Florian Westphal
2016-09-30 7:26 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).