diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-04-08 09:24:23 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-04-08 09:24:23 +0300 |
| commit | dc2e0617f1fd0c5a6f601502b4379113a84ffecf (patch) | |
| tree | d6959aa21296841b6ec543291cd66ed66a6e5c33 /net/ipv6/ip6mr.c | |
| parent | 27a5a5685d373cd8c18b1d83f42a83e5a2f93e6c (diff) | |
| parent | 73b193f265096080eac866b9a852627b475384fc (diff) | |
| download | linux-dc2e0617f1fd0c5a6f601502b4379113a84ffecf.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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)) |