pull request (net-next): ipsec-next 2016-12-01

pull request (net-next): ipsec-next 2016-12-01

[Steffen Klassert]

Just one patch this time:

1) Remove the unused make_jiffies helper.
   From Florian Westphal.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 31fbe81fe3426dfb7f8056a7f5106c6b1841a9aa:

  Merge branch 'qcom-emac-acpi' (2016-09-29 01:50:20 -0400)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master

for you to fetch changes up to 2258d927a691ddd2ab585adb17ea9f96e89d0638:

  xfrm: remove unused helper (2016-09-30 08:20:56 +0200)

----------------------------------------------------------------
Florian Westphal (1):
      xfrm: remove unused helper

 net/xfrm/xfrm_state.c | 8 --------
 1 file changed, 8 deletions(-)

[PATCH] xfrm: remove unused helper

[Steffen Klassert]

From: Florian Westphal <fw@strlen.de>

Not used anymore since 2009 (9e0d57fd6dad37,
'xfrm: SAD entries do not expire correctly after suspend-resume').

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 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 419bf5d..45cb7c6 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);
-- 
1.9.1

Re: pull request (net-next): ipsec-next 2016-12-01

[David Miller]

From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 1 Dec 2016 12:48:04 +0100

>   git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
> 
> for you to fetch changes up to 2258d927a691ddd2ab585adb17ea9f96e89d0638:
> 
>   xfrm: remove unused helper (2016-09-30 08:20:56 +0200)

Hmmm, when I try to pull I don't get anything:

[davem@dhcp-10-15-49-210 net-next]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
>From git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
 * branch            master     -> FETCH_HEAD
Already up-to-date.

Re: pull request (net-next): ipsec-next 2016-12-01

[Steffen Klassert]

On Thu, Dec 01, 2016 at 11:45:16AM -0500, David Miller wrote:
> From: Steffen Klassert <steffen.klassert@secunet.com>
> Date: Thu, 1 Dec 2016 12:48:04 +0100
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
> > 
> > for you to fetch changes up to 2258d927a691ddd2ab585adb17ea9f96e89d0638:
> > 
> >   xfrm: remove unused helper (2016-09-30 08:20:56 +0200)
> 
> Hmmm, when I try to pull I don't get anything:
> 
> [davem@dhcp-10-15-49-210 net-next]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
> >From git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
>  * branch            master     -> FETCH_HEAD
> Already up-to-date.

Oh yes, my bad. You've got it already with my last pull request.

Sorry.