Skip to content

Commit

Permalink
batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipien…
Browse files Browse the repository at this point in the history
…t_get

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
  • Loading branch information
Sven Eckelmann authored and Antonio Quartulli committed Jun 7, 2015
1 parent a2f2b6c commit 7dac6d9
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions net/batman-adv/gateway_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 7dac6d9

Please sign in to comment.