diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-13 22:28:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-13 22:28:11 -0800 |
| commit | 03b967420280f01b225d9f7c46c2d9117e1bc16b (patch) | |
| tree | 9735f3a556cb2a325bd906a91fdf9ffe1ec01f90 /net/batman-adv/soft-interface.c | |
| parent | e7c2e3b570442d2a50d43ba0da951329ed0c3c19 (diff) | |
| parent | 7e6f461efe2554e35b740f3faea2994fc9551947 (diff) | |
| download | talos-op-linux-03b967420280f01b225d9f7c46c2d9117e1bc16b.tar.gz talos-op-linux-03b967420280f01b225d9f7c46c2d9117e1bc16b.zip | |
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>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 93a5975c21a4..5cb4a2f53a2f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -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" |
