Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22195
b: refs/heads/master
c: 0ac8475
h: refs/heads/master
i:
  22193: f7f13c0
  22191: 3d528a2
v: v3
  • Loading branch information
David S. Miller committed Mar 21, 2006
1 parent f84061c commit c0e8449
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c29bfe1cfbe6050c797a6364a0cc0ff57c377fc
refs/heads/master: 0ac8475248164553ffe21948c7b1a4b9d2a935dc
4 changes: 2 additions & 2 deletions trunk/net/xfrm/xfrm_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c0e8449

Please sign in to comment.