---

yaml --- r: 32833 b: refs/heads/master c: d569f1d h: refs/heads/master i: 32831: a910a93 v: v3
git-mirror · Jul 25, 2006 · f580ef1 · f580ef1
1 parent c68ec65
commit f580ef1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7fdc3ae18a0598a999156b62d55ea55220e00f
+refs/heads/master: d569f1d72f068992d07ab17f7ff9aea7f0d97cdb
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
@@ -429,7 +429,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
 	}
 
 	/* Remove any debris in the socket control block */
-	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+	memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
 
 	return NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, dev, NULL,
 		       ip_rcv_finish);