Merge tag 'batadv-next-for-davem-20190213' of git://git.open-mesh.org/linux-merge
[sfrench/cifs-2.6.git] / net / batman-adv / soft-interface.c
index 93a5975c21a42b2d346aee18e1e01aaec50b6d73..5cb4a2f53a2f8180551c88c53adf94d6db212288 100644 (file)
 #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"