diff options
author | Li RongQing <roy.qing.li@gmail.com> | 2012-12-28 03:06:28 -0500 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-01-07 05:18:58 -0500 |
commit | bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3 (patch) | |
tree | 43c6b5d97e05f485be22918d96450159b1d9b239 /net/xfrm/xfrm_state.c | |
parent | 483f777266f5da205459c290994bd3cda5f1f6bc (diff) |
xfrm: removes a superfluous check and add a statistic
Remove the check if x->km.state equal to XFRM_STATE_VALID in
xfrm_state_check_expire(), which will be done before call
xfrm_state_check_expire().
add a LINUX_MIB_XFRMOUTSTATEINVALID statistic to record the
outbound error due to invalid xfrm state.
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 3459692092ec..05db2362a231 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -1370,9 +1370,6 @@ int xfrm_state_check_expire(struct xfrm_state *x) | |||
1370 | if (!x->curlft.use_time) | 1370 | if (!x->curlft.use_time) |
1371 | x->curlft.use_time = get_seconds(); | 1371 | x->curlft.use_time = get_seconds(); |
1372 | 1372 | ||
1373 | if (x->km.state != XFRM_STATE_VALID) | ||
1374 | return -EINVAL; | ||
1375 | |||
1376 | if (x->curlft.bytes >= x->lft.hard_byte_limit || | 1373 | if (x->curlft.bytes >= x->lft.hard_byte_limit || |
1377 | x->curlft.packets >= x->lft.hard_packet_limit) { | 1374 | x->curlft.packets >= x->lft.hard_packet_limit) { |
1378 | x->km.state = XFRM_STATE_EXPIRED; | 1375 | x->km.state = XFRM_STATE_EXPIRED; |