aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2013-05-12 15:57:09 -0400
committerAntonio Quartulli <antonio@meshcoding.com>2013-10-12 05:58:33 -0400
commit2c598663e84c8c8edbbac568e9e94e1fac410c3c (patch)
tree31a8a5d955662be5c584577186231a2c6cd50676
parentf7f8ed5695ef441495cfab5287951927d9d5f12e (diff)
batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr)
Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
-rw-r--r--net/batman-adv/bridge_loop_avoidance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 264de88db320..70da18ab41c3 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1380,7 +1380,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,
1380 ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); 1380 ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size);
1381 1381
1382 if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { 1382 if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) {
1383 if (!pskb_may_pull(skb, hdr_size + sizeof(struct vlan_ethhdr))) 1383 if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN))
1384 return 0; 1384 return 0;
1385 1385
1386 vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size); 1386 vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size);