projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2a103e
)
ipv4: Kill spurious opt->srr check in ip_options_rcv_srr().
author
David S. Miller
<davem@davemloft.net>
Thu, 12 May 2011 23:26:57 +0000
(19:26 -0400)
committer
David S. Miller
<davem@davemloft.net>
Thu, 12 May 2011 23:26:57 +0000
(19:26 -0400)
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>
net/ipv4/ip_options.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv4/ip_options.c
b/net/ipv4/ip_options.c
index 01fc4096584896c8f51cb65552323e95fff08110..e82c304806bb41c0997074c56c919baa101d0786 100644
(file)
--- 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)