Commit 1a01912a authored by Louis Nyffenegger's avatar Louis Nyffenegger Committed by David S. Miller

[INET]: Remove is_setbyuser patch

The value is_setbyuser from struct ip_options is never used and set
only one time (http://linux-net.osdl.org/index.php/TODO#IPV4).
This little patch removes it from the kernel source.
Signed-off-by: default avatarLouis Nyffenegger <louis.nyffenegger@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0298f36a
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
/** struct ip_options - IP Options /** struct ip_options - IP Options
* *
* @faddr - Saved first hop address * @faddr - Saved first hop address
* @is_setbyuser - Set by setsockopt?
* @is_data - Options in __data, rather than skb * @is_data - Options in __data, rather than skb
* @is_strictroute - Strict source route * @is_strictroute - Strict source route
* @srr_is_hit - Packet destination addr was our one * @srr_is_hit - Packet destination addr was our one
...@@ -42,8 +41,7 @@ struct ip_options { ...@@ -42,8 +41,7 @@ struct ip_options {
unsigned char srr; unsigned char srr;
unsigned char rr; unsigned char rr;
unsigned char ts; unsigned char ts;
unsigned char is_setbyuser:1, unsigned char is_data:1,
is_data:1,
is_strictroute:1, is_strictroute:1,
srr_is_hit:1, srr_is_hit:1,
is_changed:1, is_changed:1,
......
...@@ -525,7 +525,6 @@ static int ip_options_get_finish(struct ip_options **optp, ...@@ -525,7 +525,6 @@ static int ip_options_get_finish(struct ip_options **optp,
opt->__data[optlen++] = IPOPT_END; opt->__data[optlen++] = IPOPT_END;
opt->optlen = optlen; opt->optlen = optlen;
opt->is_data = 1; opt->is_data = 1;
opt->is_setbyuser = 1;
if (optlen && ip_options_compile(opt, NULL)) { if (optlen && ip_options_compile(opt, NULL)) {
kfree(opt); kfree(opt);
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment