projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
[firefly-linux-kernel-4.4.55.git]
/
net
/
xfrm
/
xfrm_output.c
diff --git
a/net/xfrm/xfrm_output.c
b/net/xfrm/xfrm_output.c
index 3670526e70b97e804e90404036c89a5e54b5dcf5..bcfda8921b5bf944d38ac3e087eb1cccfac327fe 100644
(file)
--- a/
net/xfrm/xfrm_output.c
+++ b/
net/xfrm/xfrm_output.c
@@
-64,7
+64,7
@@
static int xfrm_output_one(struct sk_buff *skb, int err)
if (unlikely(x->km.state != XFRM_STATE_VALID)) {
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);
- goto error
_nolock
;
+ goto error;
}
err = xfrm_state_check_expire(x);