Commit 10fe7d85 authored Mar 22, 2008 by Denis V. Lunev Committed by David S. Miller Mar 22, 2008

[IPV4]: Remove unnecessary check for opt->is_data in ip_options_compile.



There is the only way to reach ip_options compile with opt != NULL:

ip_options_get_finish
    opt->is_data = 1;
    ip_options_compile(opt, NULL)

So, checking for is_data inside opt != NULL branch is not needed.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ec3c0982

net/ipv4/ip_options.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}