[linux-next] LinuxNextTracking branch, master, updated. next-20160919

batman at open-mesh.org batman at open-mesh.org
Tue Sep 20 00:15:40 CEST 2016

The following commit has been merged in the master branch:
commit 1e5d343b8f23770e8ac5d31f5c439826bdb35148
Author: Linus Lüssing <linus.luessing at c0d3.blue>
Date:   Tue Aug 23 03:13:03 2016 +0200

    batman-adv: fix elp packet data reservation
    The skb_reserve() call only reserved headroom for the mac header, but
    not the elp packet header itself.
    Fixing this by using skb_put()'ing towards the skb tail instead of
    skb_push()'ing towards the skb head.
    Fixes: d6f94d91f766 ("batman-adv: ELP - adding basic infrastructure")
    Signed-off-by: Linus Lüssing <linus.luessing at c0d3.blue>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 7d17001..ee08540 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -335,7 +335,7 @@ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface)
 		goto out;
 	skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN);
-	elp_buff = skb_push(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
+	elp_buff = skb_put(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
 	elp_packet = (struct batadv_elp_packet *)elp_buff;
 	memset(elp_packet, 0, BATADV_ELP_HLEN);


More information about the linux-merge mailing list