summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-13 01:26:57 +0200
committerDavid S. Miller <davem@davemloft.net>2011-05-13 01:26:57 +0200
commit10949550bd1e50cc91c0f5085f7080a44b0871fe (patch)
treee5a1862145c488c6abf9d12cc52a1db90481823d
parentbonding: convert to ndo_fix_features (diff)
downloadlinux-10949550bd1e50cc91c0f5085f7080a44b0871fe.tar.xz
linux-10949550bd1e50cc91c0f5085f7080a44b0871fe.zip
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>
-rw-r--r--net/ipv4/ip_options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 01fc40965848..e82c304806bb 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)