From c0e84493bb5d1544c7a4ff5863dee016d7da80c0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 20 Mar 2006 19:18:23 -0800 Subject: [PATCH] --- yaml --- r: 22195 b: refs/heads/master c: 0ac8475248164553ffe21948c7b1a4b9d2a935dc h: refs/heads/master i: 22193: f7f13c0c1469b5611e59c3b413d7bea5d5274fed 22191: 3d528a2f38d6507f53cb9da1b4f04248af350716 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 05160ad837d6..ea8ef3e34d84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c29bfe1cfbe6050c797a6364a0cc0ff57c377fc +refs/heads/master: 0ac8475248164553ffe21948c7b1a4b9d2a935dc diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c index 8df547d7d61c..cd1d5e11ee74 100644 --- a/trunk/net/xfrm/xfrm_state.c +++ b/trunk/net/xfrm/xfrm_state.c @@ -179,6 +179,8 @@ static void xfrm_timer_handler(unsigned long data) xfrm_state_put(x); } +static void xfrm_replay_timer_handler(unsigned long data); + struct xfrm_state *xfrm_state_alloc(void) { struct xfrm_state *x; @@ -815,11 +817,9 @@ void xfrm_replay_notify(struct xfrm_state *x, int event) c.data.aevent = event; km_state_notify(x, &c); -resched: if (x->replay_maxage && !mod_timer(&x->rtimer, jiffies + x->replay_maxage)) xfrm_state_hold(x); - } static void xfrm_replay_timer_handler(unsigned long data)