Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 78628
b: refs/heads/master
c: b15c4bc
h: refs/heads/master
v: v3
  • Loading branch information
Masahide NAKAMURA authored and David S. Miller committed Jan 28, 2008
1 parent 86a8ec5 commit 286fae6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 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: 426b5303eb435d98b9bee37a807be386bc2b3320
refs/heads/master: b15c4bcd15741b31019379298edfca28dc78029d
12 changes: 9 additions & 3 deletions trunk/net/xfrm/xfrm_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,23 @@ static int xfrm_output_one(struct sk_buff *skb, int err)

do {
err = xfrm_state_check_space(x, skb);
if (err)
if (err) {
XFRM_INC_STATS(LINUX_MIB_XFRMOUTERROR);
goto error_nolock;
}

err = x->outer_mode->output(x, skb);
if (err)
if (err) {
XFRM_INC_STATS(LINUX_MIB_XFRMOUTSTATEMODEERROR);
goto error_nolock;
}

spin_lock_bh(&x->lock);
err = xfrm_state_check_expire(x);
if (err)
if (err) {
XFRM_INC_STATS(LINUX_MIB_XFRMOUTSTATEEXPIRED);
goto error;
}

if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
XFRM_SKB_CB(skb)->seq = ++x->replay.oseq;
Expand Down

0 comments on commit 286fae6

Please sign in to comment.