batman-adv: use vlan_/eth_hdr() instead of skb->data in interface_tx path

Our .ndo_start_xmit handler (batadv_interface_tx()) can rely on having
the skb mac header pointer set correctly since the following commit
present in kernels >= 3.9:

"net: reset mac header in dev_start_xmit()" (6d1ccff627)

Therefore we can safely use eth_hdr() and vlan_eth_hdr() instead of
skb->data now, which spares us some ugly type casts.

At the same time set the mac_header in batadv_dat_snoop_incoming_arp_request()
before sending the skb along the TX path.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index d7fafc1009a0..07c7f2177648 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -678,7 +678,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,
         if (!pskb_may_pull(skb, *header_len + ETH_HLEN))
                 return BATADV_DHCP_NO;
 
-        ethhdr = (struct ethhdr *)skb->data;
+        ethhdr = eth_hdr(skb);
         proto = ethhdr->h_proto;
         *header_len += ETH_HLEN;
 
@@ -687,7 +687,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,
                 if (!pskb_may_pull(skb, *header_len + VLAN_HLEN))
                         return BATADV_DHCP_NO;
 
-                vhdr = (struct vlan_ethhdr *)skb->data;
+                vhdr = vlan_eth_hdr(skb);
                 proto = vhdr->h_vlan_encapsulated_proto;
                 *header_len += VLAN_HLEN;
         }
@@ -726,7 +726,7 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,
                 return BATADV_DHCP_NO;
 
         /* skb->data might have been reallocated by pskb_may_pull() */
-        ethhdr = (struct ethhdr *)skb->data;
+        ethhdr = eth_hdr(skb);
         if (ntohs(ethhdr->h_proto) == ETH_P_8021Q)
                 ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN);