* pull request (net-next): ipsec-next 2016-10-25
@ 2016-10-25 5:05 Steffen Klassert
2016-10-25 5:05 ` [PATCH] xfrm: remove unused helper Steffen Klassert
2016-10-28 17:27 ` pull request (net-next): ipsec-next 2016-10-25 David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Steffen Klassert @ 2016-10-25 5:05 UTC (permalink / raw)
To: David Miller; +Cc: Herbert Xu, Steffen Klassert, netdev
Just a leftover from the last development cycle.
1) Remove some unused code, 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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] xfrm: remove unused helper
2016-10-25 5:05 pull request (net-next): ipsec-next 2016-10-25 Steffen Klassert
@ 2016-10-25 5:05 ` Steffen Klassert
2016-10-28 17:27 ` pull request (net-next): ipsec-next 2016-10-25 David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Steffen Klassert @ 2016-10-25 5:05 UTC (permalink / raw)
To: David Miller; +Cc: Herbert Xu, Steffen Klassert, netdev
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: pull request (net-next): ipsec-next 2016-10-25
2016-10-25 5:05 pull request (net-next): ipsec-next 2016-10-25 Steffen Klassert
2016-10-25 5:05 ` [PATCH] xfrm: remove unused helper Steffen Klassert
@ 2016-10-28 17:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-10-28 17:27 UTC (permalink / raw)
To: steffen.klassert; +Cc: herbert, netdev
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 25 Oct 2016 07:05:40 +0200
> Just a leftover from the last development cycle.
>
> 1) Remove some unused code, from Florian Westphal.
>
> Please pull or let me know if there are problems.
Pulled, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-28 17:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-25 5:05 pull request (net-next): ipsec-next 2016-10-25 Steffen Klassert
2016-10-25 5:05 ` [PATCH] xfrm: remove unused helper Steffen Klassert
2016-10-28 17:27 ` pull request (net-next): ipsec-next 2016-10-25 David Miller
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).