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 tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
xt_ipcomp.c
diff --git
a/net/netfilter/xt_ipcomp.c
b/net/netfilter/xt_ipcomp.c
index a4c7561698c5c2fa5dd9b79717e0cc7116347e54..89d53104c6b365b12c76ff684064bc5d032656c3 100644
(file)
--- a/
net/netfilter/xt_ipcomp.c
+++ b/
net/netfilter/xt_ipcomp.c
@@
-60,7
+60,7
@@
static bool comp_mt(const struct sk_buff *skb, struct xt_action_param *par)
}
return spi_match(compinfo->spis[0], compinfo->spis[1],
- ntoh
l(chdr->cpi << 16
),
+ ntoh
s(chdr->cpi
),
!!(compinfo->invflags & XT_IPCOMP_INV_SPI));
}