aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-21 01:55:24 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 01:55:24 -0500
commit9ebddc1aa386f257125a569b41f90418b63b4d5f (patch)
tree4f0ed919d84754e1690ef7badec50f0079677f8d /net/bridge
parent74ca4e5acd7d09a5133bb75043c2c474347f2c7e (diff)
[BRIDGE] br_netfilter: Warning fixes.
net/bridge/br_netfilter.c: In function `br_nf_pre_routing': net/bridge/br_netfilter.c:427: warning: unused variable `vhdr' net/bridge/br_netfilter.c:445: warning: unused variable `vhdr' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 6787bc5197f7..70a395baaa01 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -424,7 +424,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
424 goto out; 424 goto out;
425 425
426 if (skb->protocol == __constant_htons(ETH_P_8021Q)) { 426 if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
427 u8 *vhdr = skb->data;
428 skb_pull_rcsum(skb, VLAN_HLEN); 427 skb_pull_rcsum(skb, VLAN_HLEN);
429 skb->nh.raw += VLAN_HLEN; 428 skb->nh.raw += VLAN_HLEN;
430 } 429 }
@@ -442,7 +441,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
442 goto out; 441 goto out;
443 442
444 if (skb->protocol == __constant_htons(ETH_P_8021Q)) { 443 if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
445 u8 *vhdr = skb->data;
446 skb_pull_rcsum(skb, VLAN_HLEN); 444 skb_pull_rcsum(skb, VLAN_HLEN);
447 skb->nh.raw += VLAN_HLEN; 445 skb->nh.raw += VLAN_HLEN;
448 } 446 }