diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netfilter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 5439a3c46c3e..1163c4f69899 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -753,7 +753,8 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, | |||
753 | #ifdef CONFIG_NETFILTER_DEBUG | 753 | #ifdef CONFIG_NETFILTER_DEBUG |
754 | /* Be very paranoid. This probably won't happen anymore, but let's | 754 | /* Be very paranoid. This probably won't happen anymore, but let's |
755 | * keep the check just to be sure... */ | 755 | * keep the check just to be sure... */ |
756 | if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) { | 756 | if (skb_mac_header(skb) < skb->head || |
757 | skb_mac_header(skb) + ETH_HLEN > skb->data) { | ||
757 | printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: " | 758 | printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: " |
758 | "bad mac.raw pointer.\n"); | 759 | "bad mac.raw pointer.\n"); |
759 | goto print_error; | 760 | goto print_error; |
@@ -808,7 +809,7 @@ print_error: | |||
808 | if (realoutdev) | 809 | if (realoutdev) |
809 | printk("[%s]", realoutdev->name); | 810 | printk("[%s]", realoutdev->name); |
810 | } | 811 | } |
811 | printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, | 812 | printk(" head:%p, raw:%p, data:%p\n", skb->head, skb_mac_header(skb), |
812 | skb->data); | 813 | skb->data); |
813 | dump_stack(); | 814 | dump_stack(); |
814 | return NF_ACCEPT; | 815 | return NF_ACCEPT; |