From f580ef18b1c03e475aff5d09a0e5fcf73a0bb07d Mon Sep 17 00:00:00 2001
From: Guillaume Chazarain <guichaz@yahoo.fr>
Date: Mon, 24 Jul 2006 23:45:16 -0700
Subject: [PATCH] --- yaml --- r: 32833 b: refs/heads/master c:
 d569f1d72f068992d07ab17f7ff9aea7f0d97cdb h: refs/heads/master i:   32831:
 a910a93121267743c623496cf36dddd5047a9166 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/ip_input.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02c444574453..efa6ce746e16 100644
--- 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
index 184c78ca79e6..212734ca238f 100644
--- 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);