diff options
| author | Sven Eckelmann <sven@narfation.org> | 2015-04-23 18:22:25 +0200 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2015-06-07 17:07:20 +0200 |
| commit | 7dac6d9391b89fd85bb5eddd18506ae759c9a57b (patch) | |
| tree | cc5f37a56db6c86d889787e9f7a0f1bb608148dc /net/batman-adv | |
| parent | batman-adv: Clarify calculation precedence for '&' and '?' (diff) | |
| download | linux-7dac6d9391b89fd85bb5eddd18506ae759c9a57b.tar.xz linux-7dac6d9391b89fd85bb5eddd18506ae759c9a57b.zip | |
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>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/gateway_client.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 14f0a2207379..bb0158620628 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); |