From: David S. Miller <davem@davemloft.net>
Date: Fri, 13 May 2011 21:31:02 +0000 (-0400)
Subject: ipv4: Remove rt->rt_dst reference from ip_forward_options().
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7be799a70ba3dd90a59e8d2c72bbe06020005b3f;p=linux-beck.git

ipv4: Remove rt->rt_dst reference from ip_forward_options().

At this point iph->daddr equals what rt->rt_dst would hold.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 89268baabc87..c3118e1cd3bb 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -567,7 +567,7 @@ void ip_forward_options(struct sk_buff *skb)
 		     ) {
 			if (srrptr + 3 > srrspace)
 				break;
-			if (memcmp(&rt->rt_dst, &optptr[srrptr-1], 4) == 0)
+			if (memcmp(&ip_hdr(skb)->daddr, &optptr[srrptr-1], 4) == 0)
 				break;
 		}
 		if (srrptr + 3 <= srrspace) {