---

yaml --- r: 34443 b: refs/heads/master c: 1a01912 h: refs/heads/master i: 34441: 7a76f52 34439: 11dc73d v: v3
git-mirror · Sep 22, 2006 · a2fe4cf · a2fe4cf
1 parent 88518de
commit a2fe4cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;