The following commit has been merged in the master branch: commit 03b967420280f01b225d9f7c46c2d9117e1bc16b Merge: e7c2e3b570442d2a50d43ba0da951329ed0c3c19 7e6f461efe2554e35b740f3faea2994fc9551947 Author: David S. Miller davem@davemloft.net Date: Wed Feb 13 22:28:11 2019 -0800

Merge tag 'batadv-next-for-davem-20190213' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

==================== This feature/cleanup patchset includes the following patches:

- fix memory leak in in batadv_dat_put_dhcp, by Martin Weinelt

- fix typo, by Sven Eckelmann

- netlink restructuring patch series (part 2), by Sven Eckelmann (19 patches) ====================

Signed-off-by: David S. Miller davem@davemloft.net

diff --combined net/batman-adv/soft-interface.c index 93a5975c21a4,12028c287de5..5cb4a2f53a2f --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -50,13 -50,13 +50,13 @@@ #include <linux/string.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> + #include <uapi/linux/batman_adv.h>

#include "bat_algo.h" #include "bridge_loop_avoidance.h" #include "debugfs.h" #include "distributed-arp-table.h" #include "gateway_client.h" - #include "gateway_common.h" #include "hard-interface.h" #include "multicast.h" #include "network-coding.h" @@@ -222,8 -222,6 +222,8 @@@ static netdev_tx_t batadv_interface_tx(

netif_trans_update(soft_iface); vid = batadv_get_vid(skb, 0); + + skb_reset_mac_header(skb); ethhdr = eth_hdr(skb);

proto = ethhdr->h_proto;