diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-28 20:26:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-28 20:26:27 +0300 |
| commit | 1d0057883626a004365537dff741b31eaf9e27a4 (patch) | |
| tree | 46bf045c3fcc79e358d566c4dbb366df2caf1ada /net | |
| parent | 002d8a1a6c11b9b2a8ac615095589111dd52749b (diff) | |
| parent | 2258d927a691ddd2ab585adb17ea9f96e89d0638 (diff) | |
| download | linux-1d0057883626a004365537dff741b31eaf9e27a4.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 419bf5d463bd..45cb7c699b65 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); |