From a2fe4cf53d33ef822563c1fdf8a4f9d75ee7eb2d Mon Sep 17 00:00:00 2001
From: Louis Nyffenegger <louis.nyffenegger@gmail.com>
Date: Tue, 8 Aug 2006 00:56:11 -0700
Subject: [PATCH] --- yaml --- r: 34443 b: refs/heads/master c:
 1a01912ae0a5666c4c24eaae2b4821711e2ad79a h: refs/heads/master i:   34441:
 7a76f525f2cc61b4f44a38036f1484866cd5fda1   34439:
 11dc73dc25468841a839aa0cd3915bdaff9eb706 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/inet_sock.h | 4 +---
 trunk/net/ipv4/ip_options.c   | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5315cae046b3..7be130ab58bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0298f36a579b5bd7f10f6f6d57e5929977a865a1
+refs/heads/master: 1a01912ae0a5666c4c24eaae2b4821711e2ad79a
diff --git a/trunk/include/net/inet_sock.h b/trunk/include/net/inet_sock.h
index f4caad56cd03..f6242710f2ff 100644
--- a/trunk/include/net/inet_sock.h
+++ b/trunk/include/net/inet_sock.h
@@ -27,7 +27,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
@@ -42,8 +41,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,
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index e0a93b4fa8cc..e7437c091326 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -525,7 +525,6 @@ static int ip_options_get_finish(struct ip_options **optp,
 		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;