[commits] [batman-adv] master: batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get (e944023)

postmaster at open-mesh.org postmaster at open-mesh.org
Sun Apr 26 13:59:56 CEST 2015


Repository : ssh://git@open-mesh.org/batman-adv

On branch  : master

>---------------------------------------------------------------

commit e94402357d724e854adc1405f11ce82b26c5d744
Author: Sven Eckelmann <sven at 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 at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>


>---------------------------------------------------------------

e94402357d724e854adc1405f11ce82b26c5d744
 net/batman-adv/gateway_client.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 14f0a22..bb01586 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);
 



More information about the commits mailing list