diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:36 +0200 |
| commit | 188de5dd80b2b7986e75821374efb67081049b6e (patch) | |
| tree | 545bbc0fdb58f30c0175128e3b5a9c00c89e2020 /net/ipv4/ping.c | |
| parent | 5207ca554bfcb5a32959eb12b6aff8f64384492c (diff) | |
| parent | abf1a08ff3237a27188ff8cc2904f2cea893af55 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 8d7aaf118a30..7ccb5f87f70b 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -779,7 +779,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) } if (ipv4_is_multicast(daddr)) { - if (!ipc.oif) + if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif)) ipc.oif = inet->mc_index; if (!saddr) saddr = inet->mc_addr; |