From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 May 2011 23:26:57 +0000 (-0400)
Subject: ipv4: Kill spurious opt->srr check in ip_options_rcv_srr().
X-Git-Tag: v3.0-rc1~377^2~104^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10949550bd1e50cc91c0f5085f7080a44b0871fe;p=platform%2Fkernel%2Flinux-3.10.git

ipv4: Kill spurious opt->srr check in ip_options_rcv_srr().

All call sites conditionalize the call to ip_options_rcv_srr()
with a check of opt->srr, so no need to check it again there.

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

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 01fc409..e82c304 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -601,7 +601,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
 	unsigned long orefdst;
 	int err;
 
-	if (!opt->srr || !rt)
+	if (!rt)
 		return 0;
 
 	if (skb->pkt_type != PACKET_HOST)