diff --git a/[refs] b/[refs]
index a876c6b10409..1b47730066e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c3a42db6ca46204b35f0cdb8abfa9e4771641ef
+refs/heads/master: c9c556b63b19c8b52de5c5ea6f47ab16fc540e47
diff --git a/trunk/drivers/staging/batman-adv/gateway_client.c b/trunk/drivers/staging/batman-adv/gateway_client.c
index 3d4e1096a9dc..fde1d8a952fd 100644
--- a/trunk/drivers/staging/batman-adv/gateway_client.c
+++ b/trunk/drivers/staging/batman-adv/gateway_client.c
@@ -415,6 +415,14 @@ int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb)
 	ethhdr = (struct ethhdr *)skb->data;
 	header_len += ETH_HLEN;
 
+	/* check for initial vlan header */
+	if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) {
+		if (!pskb_may_pull(skb, header_len + VLAN_HLEN))
+			return 0;
+		ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN);
+		header_len += VLAN_HLEN;
+	}
+
 	/* check for ip header */
 	if (ntohs(ethhdr->h_proto) != ETH_P_IP)
 		return 0;