git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[sfrench/cifs-2.6.git]
/
net
/
xfrm
/
xfrm_state.c
diff --git
a/net/xfrm/xfrm_state.c
b/net/xfrm/xfrm_state.c
index 42995741263386852b61a6a72a23669f4d134b5b..a3785f538018dc8a777f7768752d8f5f7cedb1e1 100644
(file)
--- a/
net/xfrm/xfrm_state.c
+++ b/
net/xfrm/xfrm_state.c
@@
-317,7
+317,7
@@
retry:
if (!type && try_load) {
request_module("xfrm-offload-%d-%d", family, proto);
if (!type && try_load) {
request_module("xfrm-offload-%d-%d", family, proto);
- try_load =
0
;
+ try_load =
false
;
goto retry;
}
goto retry;
}
@@
-2272,8
+2272,6
@@
int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
goto error;
}
goto error;
}
- x->km.state = XFRM_STATE_VALID;
-
error:
return err;
}
error:
return err;
}
@@
-2282,7
+2280,13
@@
EXPORT_SYMBOL(__xfrm_init_state);
int xfrm_init_state(struct xfrm_state *x)
{
int xfrm_init_state(struct xfrm_state *x)
{
- return __xfrm_init_state(x, true, false);
+ int err;
+
+ err = __xfrm_init_state(x, true, false);
+ if (!err)
+ x->km.state = XFRM_STATE_VALID;
+
+ return err;
}
EXPORT_SYMBOL(xfrm_init_state);
}
EXPORT_SYMBOL(xfrm_init_state);