[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAKD1Yr1f=LtJGnzOEoy2Co2A_2LzqjSdU6dJZWCy3+WeXWJe3g@mail.gmail.com>
Date: Mon, 3 Jun 2013 18:25:39 +0900
From: Lorenzo Colitti <lorenzo@...gle.com>
To: Cong Wang <amwang@...hat.com>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"David S. Miller" <davem@...emloft.net>
Subject: Re: [Patch net-next v2] ping: always initialize ->sin6_scope_id and ->sin6_flowinfo
On Mon, Jun 3, 2013 at 5:43 PM, Cong Wang <amwang@...hat.com> wrote:
> From: Cong Wang <amwang@...hat.com>
>
> If we don't need scope id, we should initialize it to zero.
> Same for ->sin6_flowinfo.
>
> Cc: Lorenzo Colitti <lorenzo@...gle.com>
> Cc: David S. Miller <davem@...emloft.net>
> Signed-off-by: Cong Wang <amwang@...hat.com>
> ---
> net/ipv4/ping.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
> index 71f6ad0..0f419a2 100644
> --- a/net/ipv4/ping.c
> +++ b/net/ipv4/ping.c
> @@ -892,12 +892,12 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> sin6->sin6_port = 0;
> sin6->sin6_addr = ip6->saddr;
>
> + sin6->sin6_flowinfo = 0;
> if (np->sndflow)
> sin6->sin6_flowinfo = ip6_flowinfo(ip6);
>
> - if (__ipv6_addr_needs_scope_id(
> - ipv6_addr_type(&sin6->sin6_addr)))
> - sin6->sin6_scope_id = IP6CB(skb)->iif;
> + sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
> + IP6CB(skb)->iif);
>
> if (inet6_sk(sk)->rxopt.all)
> pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
Acked-by: Lorenzo Colitti <lorenzo@...gle.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists