Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ebddc1a authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74ca4e5a

net/bridge/br_netfilter.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -424,7 +424,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, 
			goto out;

			goto out;





		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {

		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {

			u8 *vhdr = skb->data;

			skb_pull_rcsum(skb, VLAN_HLEN);

			skb_pull_rcsum(skb, VLAN_HLEN);

			skb->nh.raw += 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;

		goto out;





	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {

	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {

		u8 *vhdr = skb->data;

		skb_pull_rcsum(skb, VLAN_HLEN);

		skb_pull_rcsum(skb, VLAN_HLEN);

		skb->nh.raw += VLAN_HLEN;

		skb->nh.raw += VLAN_HLEN;

	}

	}