Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INET]: Remove is_setbyuser patch

Browse Source 
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: Louis Nyffenegger <louis.nyffenegger@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Louis Nyffenegger 2006-08-08 00:56:11 -07:00 committed by David S. Miller
parent 0298f36a57
commit 1a01912ae0
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/inet_sock.h
View File

@ -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 {
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,

1
net/ipv4/ip_options.c
View File

@ -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;