From 3d29556ff75be1c28cf235b5c65c0c7151951402 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 15 Oct 2007 01:50:09 -0700 Subject: [PATCH] --- yaml --- r: 69414 b: refs/heads/master c: 9c2842bd94dd72d77bddb498bdd76342a0089168 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netfilter.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6ef7e07b6b25..935ad0f6ce6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 861d04860725dc85944bf9fa815af338d9e56b43 +refs/heads/master: 9c2842bd94dd72d77bddb498bdd76342a0089168 diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c index 246bf23a8775..da22f900e89d 100644 --- a/trunk/net/bridge/br_netfilter.c +++ b/trunk/net/bridge/br_netfilter.c @@ -511,9 +511,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff *skb, struct iphdr *iph; __u32 len = nf_bridge_encap_header_len(skb); - if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) - return NF_STOLEN; - if (unlikely(!pskb_may_pull(skb, len))) goto out;