remove is_setbyuser patch

remove is_setbyuser patch

[Louis Nyffenegger]

== Changelog ==

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>

== Patch ==

--- /usr/src/linux/include/net/inet_sock.h.orig 2006-08-07
17:44:18.000000000 +0200
+++ /usr/src/linux/include/net/inet_sock.h      2006-08-07
17:44:49.000000000 +0200
@@ -28,7 +28,6 @@
 /** struct ip_options - IP Options
 *
 * @faddr - Saved first hop address
- * @is_setbyuser - Set by setsockopt?
 * @is_data - Options in __data, rather than skb
 * @is_strictroute - Strict source route
 * @srr_is_hit - Packet destination addr was our one
@@ -43,8 +42,7 @@ struct ip_options {
       unsigned char   srr;
       unsigned char   rr;
       unsigned char   ts;
-       unsigned char   is_setbyuser:1,
-                       is_data:1,
+       unsigned char   is_data:1,
                       is_strictroute:1,
                       srr_is_hit:1,
                       is_changed:1,



--- /usr/src/linux/net/ipv4/ip_options.c.orig   2006-08-07
17:45:12.000000000 +0200
+++ /usr/src/linux/net/ipv4/ip_options.c        2006-08-07
17:45:23.000000000 +0200
@@ -507,7 +507,6 @@ static int ip_options_get_finish(struct
               opt->__data[optlen++] = IPOPT_END;
       opt->optlen = optlen;
       opt->is_data = 1;
-       opt->is_setbyuser = 1;
       if (optlen && ip_options_compile(opt, NULL)) {
               kfree(opt);
               return -EINVAL;

Re: remove is_setbyuser patch

[David Miller]

From: "Louis Nyffenegger" <louis.nyffenegger@gmail.com>
Date: Tue, 8 Aug 2006 09:02:44 +0200

> == Changelog ==
> 
> 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>
> 
> == Patch ==

GMAIL has corrupted your patch by changing tab characters into
spaces, among other things.

This makes your patch unusable.

Please resend the patch after configuring your email account
to not corrupt ASCII text on outgoing emails.

Re: remove is_setbyuser patch

[David Miller]

From: louis.nyffenegger@gmail.com
Date: Tue, 8 Aug 2006 10:02:31 +0200

> The same without gmail problems
> 
> == Changelog ==
> 
> 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>

Applied, thanks a lot.

remove is_setbyuser patch

[louis.nyffenegger]

The same without gmail problems

== Changelog ==

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>

== Patch ==


--- /usr/src/linux/include/net/inet_sock.h.orig	2006-08-07 17:44:18.000000000 +0200
+++ /usr/src/linux/include/net/inet_sock.h	2006-08-07 17:44:49.000000000 +0200
@@ -28,7 +28,6 @@
 /** struct ip_options - IP Options
  *
  * @faddr - Saved first hop address
- * @is_setbyuser - Set by setsockopt?
  * @is_data - Options in __data, rather than skb
  * @is_strictroute - Strict source route
  * @srr_is_hit - Packet destination addr was our one
@@ -43,8 +42,7 @@ struct ip_options {
 	unsigned char	srr;
 	unsigned char	rr;
 	unsigned char	ts;
-	unsigned char	is_setbyuser:1,
-			is_data:1,
+	unsigned char	is_data:1,
 			is_strictroute:1,
 			srr_is_hit:1,
 			is_changed:1,



--- /usr/src/linux/net/ipv4/ip_options.c.orig	2006-08-07 17:45:12.000000000 +0200
+++ /usr/src/linux/net/ipv4/ip_options.c	2006-08-07 17:45:23.000000000 +0200
@@ -507,7 +507,6 @@ static int ip_options_get_finish(struct 
 		opt->__data[optlen++] = IPOPT_END;
 	opt->optlen = optlen;
 	opt->is_data = 1;
-	opt->is_setbyuser = 1;
 	if (optlen && ip_options_compile(opt, NULL)) {
 		kfree(opt);
 		return -EINVAL;