Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (1d005788) · Commits · 戴 / test

Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2016-10-25 Just a leftover from the last development cycle. 1) Remove some unused code, from Florian Westphal. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/xfrm/xfrm_state.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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);

Admin message