diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-11 10:10:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-11 10:10:30 -0400 |
| commit | c6606a87dbb67ef79fc129c81e161f7791a1f047 (patch) | |
| tree | 28f29d5b8533b716cca9eaac68386b465f025a00 /net/xfrm | |
| parent | 7988ceefd744a3d4219233c364c9245b952bd9d4 (diff) | |
| parent | 6c786bcb29dd684533ec165057f437d5bb34a4b2 (diff) | |
| download | linux-c6606a87dbb67ef79fc129c81e161f7791a1f047.tar.gz linux-c6606a87dbb67ef79fc129c81e161f7791a1f047.tar.bz2 linux-c6606a87dbb67ef79fc129c81e161f7791a1f047.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2017-04-11
1) Remove unused field from struct xfrm_mgr.
2) Code size optimizations for the xfrm prefix hash and
address match.
3) Branch optimization for addr4_match.
All patches from Alexey Dobriyan.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_hash.h | 4 | ||||
| -rw-r--r-- | net/xfrm/xfrm_user.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_hash.h b/net/xfrm/xfrm_hash.h index 666c5ffe929d..eaea9c4fb3b0 100644 --- a/net/xfrm/xfrm_hash.h +++ b/net/xfrm/xfrm_hash.h @@ -54,8 +54,8 @@ static inline unsigned int __xfrm4_dpref_spref_hash(const xfrm_address_t *daddr, static inline unsigned int __xfrm6_pref_hash(const xfrm_address_t *addr, __u8 prefixlen) { - int pdw; - int pbi; + unsigned int pdw; + unsigned int pbi; u32 initval = 0; pdw = prefixlen >> 5; /* num of whole u32 in prefix */ diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 40a8aa39220d..4f7e62ddc17e 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -3108,7 +3108,6 @@ static bool xfrm_is_alive(const struct km_event *c) } static struct xfrm_mgr netlink_mgr = { - .id = "netlink", .notify = xfrm_send_state_notify, .acquire = xfrm_send_acquire, .compile_policy = xfrm_compile_policy, |