summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_state.c
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2012-12-28 16:06:28 +0800
committerSteffen Klassert <steffen.klassert@secunet.com>2013-01-07 11:18:58 +0100
commitbb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3 (patch)
tree43c6b5d97e05f485be22918d96450159b1d9b239 /net/xfrm/xfrm_state.c
parent483f777266f5da205459c290994bd3cda5f1f6bc (diff)
downloadlinux-bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3.tar.gz
linux-bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3.tar.bz2
linux-bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3.zip
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.c3
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)
if (!x->curlft.use_time)
x->curlft.use_time = get_seconds();
- if (x->km.state != XFRM_STATE_VALID)
- return -EINVAL;
-
if (x->curlft.bytes >= x->lft.hard_byte_limit ||
x->curlft.packets >= x->lft.hard_packet_limit) {
x->km.state = XFRM_STATE_EXPIRED;