From daa25b954a4e0c51658c4dc76a103ff8312afd58 Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Wed, 28 Nov 2012 23:23:49 -0800 Subject: [PATCH] ip_options: git meerge fix: do not duplicate setting of daddr Orabug: 15929855 Git merge duplicated line of setting daddr. This is not critical but doing clean up here. Signed-off-by: Maxim Uvarov --- net/ipv4/ip_options.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 11e62bb81dfdc..42dd1a90edea0 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -575,7 +575,6 @@ void ip_forward_options(struct sk_buff *skb) opt->is_changed = 1; ip_hdr(skb)->daddr = opt->nexthop; ip_rt_get_source(&optptr[srrptr-1], skb, rt); - ip_hdr(skb)->daddr = opt->nexthop; optptr[2] = srrptr+4; } else if (net_ratelimit()) printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n"); -- 2.50.1