projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2f2b6c
)
batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get
author
Sven Eckelmann
<sven@narfation.org>
Thu, 23 Apr 2015 16:22:25 +0000
(18:22 +0200)
committer
Antonio Quartulli
<antonio@meshcoding.com>
Sun, 7 Jun 2015 15:07:20 +0000
(17:07 +0200)
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
net/batman-adv/gateway_client.c
patch
|
blob
|
history
diff --git
a/net/batman-adv/gateway_client.c
b/net/batman-adv/gateway_client.c
index
14f0a22
..
bb01586
100644
(file)
--- 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);