diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-12 19:56:31 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:12 -0400 |
commit | d0a92be05ed4aea7d35c2b257e3f9173565fe4eb (patch) | |
tree | de57331758805956bcb54dda798e3ca76dd5a46f /net/bridge | |
parent | fd74e6ccd522e2f26163eb5ac1abebcab2bd017c (diff) |
[SK_BUFF]: Introduce arp_hdr(), remove skb->nh.arph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index ebe740f6b902..0ee74b1e4770 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -670,7 +670,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, | |||
670 | (*pskb)->nh.raw += VLAN_HLEN; | 670 | (*pskb)->nh.raw += VLAN_HLEN; |
671 | } | 671 | } |
672 | 672 | ||
673 | if (skb->nh.arph->ar_pln != 4) { | 673 | if (arp_hdr(skb)->ar_pln != 4) { |
674 | if (IS_VLAN_ARP(skb)) { | 674 | if (IS_VLAN_ARP(skb)) { |
675 | skb_push(*pskb, VLAN_HLEN); | 675 | skb_push(*pskb, VLAN_HLEN); |
676 | (*pskb)->nh.raw -= VLAN_HLEN; | 676 | (*pskb)->nh.raw -= VLAN_HLEN; |