diff options
| author | Borislav Petkov <bp@suse.de> | 2022-04-14 15:51:10 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-04-14 15:51:10 +0200 |
| commit | 96b79f20138665dc55b11b82f450d5f997903d2f (patch) | |
| tree | ace6785908a6605a0605379446e4fc5118c9fda1 /net/ipv6/ip6mr.c | |
| parent | 65fd006d5e32e9f636e4d63486e5ae9acdc433ca (diff) | |
| parent | e2932d1f6f055b2af2114c7e64a26dc1b5593d0c (diff) | |
| download | linux-next-96b79f20138665dc55b11b82f450d5f997903d2f.tar.gz | |
Merge branch 'edac-urgent' into edac-for-next
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a9775c830194..4e74bc61a3db 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1653,7 +1653,6 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, mifi_t mifi; struct net *net = sock_net(sk); struct mr_table *mrt; - bool do_wrmifwhole; if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num != IPPROTO_ICMPV6) @@ -1761,6 +1760,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, #ifdef CONFIG_IPV6_PIMSM_V2 case MRT6_PIM: { + bool do_wrmifwhole; int v; if (optlen != sizeof(v)) |