From 9f26ee42780428b0417333bdd37958d577c9f31c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 1 Sep 2010 18:06:39 -0700 Subject: [PATCH] --- yaml --- r: 210269 b: refs/heads/master c: 87f94b4e91dc042620c527f3c30c37e5127ef757 h: refs/heads/master i: 210267: 9fb941a80952e86ffb474365890b0f04f45cdd69 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netfilter.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 791ed2a842e2..322e31b2fc33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24cd804d1dc60a74c53da983094df3516500c276 +refs/heads/master: 87f94b4e91dc042620c527f3c30c37e5127ef757 diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c index 5ed00bd7009f..137f23259a93 100644 --- a/trunk/net/bridge/br_netfilter.c +++ b/trunk/net/bridge/br_netfilter.c @@ -761,9 +761,11 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb) { if (skb->nfct != NULL && skb->protocol == htons(ETH_P_IP) && skb->len + nf_bridge_mtu_reduction(skb) > skb->dev->mtu && - !skb_is_gso(skb)) + !skb_is_gso(skb)) { + /* BUG: Should really parse the IP options here. */ + memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); return ip_fragment(skb, br_dev_queue_push_xmit); - else + } else return br_dev_queue_push_xmit(skb); } #else