[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1358225829.8744.4508.camel@edumazet-glaptop>
Date: Mon, 14 Jan 2013 20:57:09 -0800
From: Eric Dumazet <eric.dumazet@...il.com>
To: Harvey Yang <harvey.huawei.yang@...il.com>
Cc: "David S. Miller" <davem@...emloft.net>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
James Morris <jmorris@...ei.org>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] net: ipv4: refine the logic for determining daddr
in ip_queue_xmit.
On Tue, 2013-01-15 at 12:47 +0800, Harvey Yang wrote:
> The destination address daddr is faddr if source route option is set, otherwise it is inet_daddr. So use if-else to assign the value.
>
> Signed-off-by: Harvey Yang <harvey.huawei.yang@...il.com>
> ---
> net/ipv4/ip_output.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
> index 3e98ed2..22b738c 100644
> --- a/net/ipv4/ip_output.c
> +++ b/net/ipv4/ip_output.c
> @@ -349,10 +349,10 @@ int ip_queue_xmit(struct sk_buff *skb, struct flowi *fl)
> __be32 daddr;
>
> /* Use correct destination address if we have options. */
> - daddr = inet->inet_daddr;
> if (inet_opt && inet_opt->opt.srr)
> daddr = inet_opt->opt.faddr;
> -
> + else
> + daddr = inet->inet_daddr;
> /* If this fails, retransmit mechanism of transport layer will
> * keep trying until route appears or the connection times
> * itself out.
Current code is faster, srr is not often used.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists