Commit 1d005788 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://

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: default avatarDavid S. Miller <>
parents 002d8a1a 2258d927
......@@ -388,14 +388,6 @@ static void xfrm_state_gc_task(struct work_struct *work)
static inline unsigned long make_jiffies(long secs)
if (secs >= (MAX_SCHEDULE_TIMEOUT-1)/HZ)
return secs*HZ;
static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment