From dd99a7e9471f00c98806ba3be889c8eb0c2c8a40 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 5 Jul 2010 21:29:28 +0000
Subject: [PATCH] --- yaml --- r: 200891 b: refs/heads/master c:
 17762060c25590bfddd68cc1131f28ec720f405f h: refs/heads/master i:   200889:
 85908f1ab08d616d24e41937cefb9d159be50788   200887:
 ad7c2b70e2e623e0e7608b0c7beadf1d6b42df9e v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netfilter.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ec9220b6186c..6eb286a67f56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f285fa78d4b81b8458f05e77fb6b46245121b4e
+refs/heads/master: 17762060c25590bfddd68cc1131f28ec720f405f
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index 44420992f72f..8fb75f89c4aa 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -591,6 +591,9 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff *skb,
 
 	pskb_trim_rcsum(skb, len);
 
+	/* BUG: Should really parse the IP options here. */
+	memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+
 	nf_bridge_put(skb->nf_bridge);
 	if (!nf_bridge_alloc(skb))
 		return NF_DROP;