From patchwork Mon Dec 23 20:43:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 3667 Return-Path: Received: from s3.neomailbox.net (s3.neomailbox.net [178.209.62.157]) by open-mesh.org (Postfix) with ESMTPS id 67B9E60208B for ; Mon, 23 Dec 2013 21:44:33 +0100 (CET) From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 23 Dec 2013 21:43:39 +0100 Message-Id: <1387831419-3848-1-git-send-email-antonio@meshcoding.com> Cc: Antonio Quartulli Subject: [B.A.T.M.A.N.] [PATCH next] batman-adv: fix vlan header access X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Dec 2013 20:44:33 -0000 When batadv_get_vid() is invoked in interface_rx() the batman-adv header has already been removed, therefore the header_len argument has to be 0. Introduced by 580d7919f19e4f73ccd79e82a532af2bdc638042 ("batman-adv: add the VLAN ID attribute to the TT entry") Signed-off-by: Antonio Quartulli --- soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 74f4630..2a09294 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -346,7 +346,7 @@ void batadv_interface_rx(struct net_device *soft_iface, skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb); - vid = batadv_get_vid(skb, hdr_size); + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) {