projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[IPV4]: Remove unnecessary check for opt->is_data in ip_options_compile.
[deliverable/linux.git]
/
net
/
ipv4
/
ip_options.c
diff --git
a/net/ipv4/ip_options.c
b/net/ipv4/ip_options.c
index df93a9c2efda9ec06060ede500d638ff724d6a23..7e94bf850a07fcd88db21498c05cf864523ff4ac 100644
(file)
--- a/
net/ipv4/ip_options.c
+++ b/
net/ipv4/ip_options.c
@@
-267,8
+267,7
@@
int ip_options_compile(struct ip_options * opt, struct sk_buff * skb)
optptr = iph + sizeof(struct iphdr);
opt->is_data = 0;
} else {
- optptr = opt->is_data ? opt->__data :
- (unsigned char *)&(ip_hdr(skb)[1]);
+ optptr = opt->__data;
iph = optptr - sizeof(struct iphdr);
}
This page took
0.025314 seconds
and
5
git commands to generate.