diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-07 23:56:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-07 23:56:32 -0400 |
| commit | 62515f95b45818ddd925569504fe52f4afd3eb7a (patch) | |
| tree | d12c866b158b3e36801e4039221829edad0a0b7f /net/ipv6 | |
| parent | 9d4927f0d3760d8f10727c3035121d2677108f44 (diff) | |
| parent | 565f0fa902b64020d5d147ff1708567e9e0b6e49 (diff) | |
| download | op-kernel-dev-62515f95b45818ddd925569504fe52f4afd3eb7a.zip op-kernel-dev-62515f95b45818ddd925569504fe52f4afd3eb7a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Minor conflict in ip_output.c, overlapping changes to
the body of an if() statement.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 2 | ||||
| -rw-r--r-- | net/ipv6/xfrm6_state.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index c214ffe..deadc4c 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -743,7 +743,7 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p) } /** - * vti6_tnl_ioctl - configure vti6 tunnels from userspace + * vti6_ioctl - configure vti6 tunnels from userspace * @dev: virtual device associated with tunnel * @ifr: parameters passed from userspace * @cmd: command to be performed diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index 16f4347..5bdca3d 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c @@ -60,11 +60,9 @@ xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl, static int __xfrm6_sort(void **dst, void **src, int n, int (*cmp)(void *p), int maxclass) { - int i; + int count[XFRM_MAX_DEPTH] = { }; int class[XFRM_MAX_DEPTH]; - int count[maxclass]; - - memset(count, 0, sizeof(count)); + int i; for (i = 0; i < n; i++) { int c; |
