The following commit has been merged in the master branch: commit 7dac6d9391b89fd85bb5eddd18506ae759c9a57b Author: Sven Eckelmann sven@narfation.org Date: Thu Apr 23 18:22:25 2015 +0200

batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 14f0a22..bb015862 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -753,11 +753,6 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr))) return BATADV_DHCP_NO;

- /* skb->data might have been reallocated by pskb_may_pull() */ - ethhdr = eth_hdr(skb); - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); - udphdr = (struct udphdr *)(skb->data + *header_len); *header_len += sizeof(*udphdr);