projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-drm-fsl-dcu.git]
/
net
/
xfrm
/
xfrm_state.c
diff --git
a/net/xfrm/xfrm_state.c
b/net/xfrm/xfrm_state.c
index 40c5271798431e0c37495051d7972daa12bc1644..da54a64ccfa3b9ffb4d4401ad3fac881591ce2dd 100644
(file)
--- a/
net/xfrm/xfrm_state.c
+++ b/
net/xfrm/xfrm_state.c
@@
-1304,7
+1304,7
@@
int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol)
}
EXPORT_SYMBOL(km_query);
-int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
u
16 sport)
+int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
__be
16 sport)
{
int err = -EINVAL;
struct xfrm_mgr *km;