diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-02 10:58:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 10:58:33 +1000 |
| commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch) | |
| tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /net/ipv4/ping.c | |
| parent | 9be23ae4350bfd71c0cc2ea3494671ee90e5603b (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.gz linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.bz2 linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.zip | |
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 57f7c9804139..5d740cccf69e 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -217,6 +217,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) &ipv6_hdr(skb)->daddr)) continue; #endif + } else { + continue; } if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif) @@ -853,16 +855,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, if (flags & MSG_OOB) goto out; - if (flags & MSG_ERRQUEUE) { - if (family == AF_INET) { - return ip_recv_error(sk, msg, len, addr_len); -#if IS_ENABLED(CONFIG_IPV6) - } else if (family == AF_INET6) { - return pingv6_ops.ipv6_recv_error(sk, msg, len, - addr_len); -#endif - } - } + if (flags & MSG_ERRQUEUE) + return inet_recv_error(sk, msg, len, addr_len); skb = skb_recv_datagram(sk, flags, noblock, &err); if (!skb) |