From 980ae71bed012fa406f48b334fb784a501e1446e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 20 Mar 2006 22:55:24 -0800 Subject: [PATCH] --- yaml --- r: 22312 b: refs/heads/master c: 9ebddc1aa386f257125a569b41f90418b63b4d5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netfilter.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c213c137e694..597569c06f72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ca4e5acd7d09a5133bb75043c2c474347f2c7e +refs/heads/master: 9ebddc1aa386f257125a569b41f90418b63b4d5f diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c index 6787bc5197f7..70a395baaa01 100644 --- a/trunk/net/bridge/br_netfilter.c +++ b/trunk/net/bridge/br_netfilter.c @@ -424,7 +424,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, goto out; if (skb->protocol == __constant_htons(ETH_P_8021Q)) { - u8 *vhdr = skb->data; skb_pull_rcsum(skb, VLAN_HLEN); skb->nh.raw += VLAN_HLEN; } @@ -442,7 +441,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, goto out; if (skb->protocol == __constant_htons(ETH_P_8021Q)) { - u8 *vhdr = skb->data; skb_pull_rcsum(skb, VLAN_HLEN); skb->nh.raw += VLAN_HLEN; }