batman-adv: Convert packet.h to uapi header

The header file is used by different userspace programs to inject packets or to decode sniffed packets. It should therefore be available to them as userspace header. Also other components in the kernel (like the flow dissector) require access to the packet definitions to be able to decode ETH_P_BATMAN ethernet packets. Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Sven Eckelmann <sven.eckelmann@openmesh.com> 2017-12-21 04:17:41 -0500
committer: David S. Miller <davem@davemloft.net> 2017-12-21 15:35:53 -0500
commit: fec149f5d3234c037ec761d1db4cc8c0550e9964 (patch)
tree: 1305e39ca26f665f14ecfdc230c6d54f1e17d769
parent: adbf9b7324e7cb734e876cd311392c0880e890f7 (diff)
26 files changed, 29 insertions, 30 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 129c591e0f34..753799d24cd9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2564,6 +2564,7 @@ S:	Maintained
 F:      Documentation/ABI/testing/sysfs-class-net-batman-adv
 F:      Documentation/ABI/testing/sysfs-class-net-mesh
 F:      Documentation/networking/batman-adv.rst
+F:      include/uapi/linux/batadv_packet.h
 F:      include/uapi/linux/batman_adv.h
 F:      net/batman-adv/
diff --git a/net/batman-adv/packet.h b/include/uapi/linux/batadv_packet.h
index 3b2d2db993aa..5cb360be2a11 100644
--- a/net/batman-adv/packet.h
+++ b/include/uapi/linux/batadv_packet.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
 /* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:
 *
 * Marek Lindner, Simon Wunderlich
@@ -16,8 +16,8 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef _NET_BATMAN_ADV_PACKET_H_
+#ifndef _UAPI_LINUX_BATADV_PACKET_H_
-#define _NET_BATMAN_ADV_PACKET_H_
+#define _UAPI_LINUX_BATADV_PACKET_H_
 #include <asm/byteorder.h>
 #include <linux/if_ether.h>
@@ -641,4 +641,4 @@ struct batadv_tvlv_mcast_data {
        __u8 reserved[3];
 };
-#endif /* _NET_BATMAN_ADV_PACKET_H_ */
+#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 84c36430c25a..79e326383726 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -52,6 +52,7 @@
 #include <linux/workqueue.h>
 #include <net/genetlink.h>
 #include <net/netlink.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "bat_algo.h"
@@ -63,7 +64,6 @@
 #include "netlink.h"
 #include "network-coding.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "translation-table.h"
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 78ddf3afa83a..27e165ac9302 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -37,6 +37,7 @@
 #include <linux/workqueue.h>
 #include <net/genetlink.h>
 #include <net/netlink.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "bat_algo.h"
@@ -49,7 +50,6 @@
 #include "log.h"
 #include "netlink.h"
 #include "originator.h"
-#include "packet.h"
 struct sk_buff;
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 59ae96cef596..a83478c46597 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -42,13 +42,13 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 #include <net/cfg80211.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bat_algo.h"
 #include "bat_v_ogm.h"
 #include "hard-interface.h"
 #include "log.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index e415974c540d..ba59b77c605d 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -39,13 +39,13 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bat_algo.h"
 #include "hard-interface.h"
 #include "hash.h"
 #include "log.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "translation-table.h"
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index e647450e5d0f..fad47853ad3c 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -50,6 +50,7 @@
 #include <net/genetlink.h>
 #include <net/netlink.h>
 #include <net/sock.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "hard-interface.h"
@@ -57,7 +58,6 @@
 #include "log.h"
 #include "netlink.h"
 #include "originator.h"
-#include "packet.h"
 #include "soft-interface.h"
 #include "sysfs.h"
 #include "translation-table.h"
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 3d47bedaf661..12897eb46268 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -24,9 +24,9 @@
 #include <linux/compiler.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
+#include <uapi/linux/batadv_packet.h>
 #include "originator.h"
-#include "packet.h"
 struct seq_file;
 struct sk_buff;
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 4979350af9a7..22dde42fd80e 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -33,10 +33,10 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <uapi/linux/batadv_packet.h>
 #include "hard-interface.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "soft-interface.h"
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 2488e25d0eef..37fe9a644f22 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -43,6 +43,7 @@
 #include <linux/stddef.h>
 #include <linux/udp.h>
 #include <net/sock.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "gateway_common.h"
@@ -50,7 +51,6 @@
 #include "log.h"
 #include "netlink.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "soft-interface.h"
 #include "sysfs.h"
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 83bfeecf661c..b3e156af2256 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -27,10 +27,10 @@
 #include <linux/netdevice.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <uapi/linux/batadv_packet.h>
 #include "gateway_client.h"
 #include "log.h"
-#include "packet.h"
 #include "tvlv.h"
 /**
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 13d04dba0b3a..5f186bff284a 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -38,6 +38,7 @@
 #include <linux/spinlock.h>
 #include <net/net_namespace.h>
 #include <net/rtnetlink.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bat_v.h"
 #include "bridge_loop_avoidance.h"
@@ -46,7 +47,6 @@
 #include "gateway_client.h"
 #include "log.h"
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 #include "soft-interface.h"
 #include "sysfs.h"
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index f2ef75b7fa73..8041cf106c37 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -44,11 +44,11 @@
 #include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
+#include <uapi/linux/batadv_packet.h>
 #include "hard-interface.h"
 #include "log.h"
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 static struct batadv_socket_client *batadv_socket_client_hash[256];
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 8bee4279d579..d31c8266e244 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -46,6 +46,7 @@
 #include <linux/workqueue.h>
 #include <net/dsfield.h>
 #include <net/rtnetlink.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "bat_algo.h"
@@ -63,7 +64,6 @@
 #include "netlink.h"
 #include "network-coding.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "soft-interface.h"
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index d5484ac381d3..f7ba3f96d8f3 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -223,8 +223,8 @@ enum batadv_uev_type {
 #include <linux/jiffies.h>
 #include <linux/percpu.h>
 #include <linux/types.h>
+#include <uapi/linux/batadv_packet.h>
-#include "packet.h"
 #include "types.h"
 struct net_device;
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 8a503c526b90..cbdeb47ec3f6 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -55,11 +55,11 @@
 #include <net/if_inet6.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
+#include <uapi/linux/batadv_packet.h>
 #include "hard-interface.h"
 #include "hash.h"
 #include "log.h"
-#include "packet.h"
 #include "translation-table.h"
 #include "tvlv.h"
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 103d4bdcdbdb..a823d3899bad 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -40,6 +40,7 @@
 #include <net/genetlink.h>
 #include <net/netlink.h>
 #include <net/sock.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "bat_algo.h"
@@ -47,7 +48,6 @@
 #include "gateway_client.h"
 #include "hard-interface.h"
 #include "originator.h"
-#include "packet.h"
 #include "soft-interface.h"
 #include "tp_meter.h"
 #include "translation-table.h"
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 3758be7fd881..b48116bb24ef 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -49,12 +49,12 @@
 #include <linux/stddef.h>
 #include <linux/string.h>
 #include <linux/workqueue.h>
+#include <uapi/linux/batadv_packet.h>
 #include "hard-interface.h"
 #include "hash.h"
 #include "log.h"
 #include "originator.h"
-#include "packet.h"
 #include "routing.h"
 #include "send.h"
 #include "tvlv.h"
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index eb835bde502a..b6891e8b741c 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -34,6 +34,7 @@
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/stddef.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bitarray.h"
 #include "bridge_loop_avoidance.h"
@@ -44,7 +45,6 @@
 #include "log.h"
 #include "network-coding.h"
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 #include "soft-interface.h"
 #include "tp_meter.h"
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index 8c7399dd06ca..1e8c79093623 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -24,8 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
+#include <uapi/linux/batadv_packet.h>
-#include "packet.h"
 struct sk_buff;
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 1eb5555c5fe4..900c5ce21cd4 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -49,6 +49,7 @@
 #include <linux/stddef.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bat_algo.h"
 #include "bridge_loop_avoidance.h"
@@ -60,7 +61,6 @@
 #include "multicast.h"
 #include "network-coding.h"
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 #include "sysfs.h"
 #include "translation-table.h"
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index 56fb42551453..c1578fa0b952 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -39,6 +39,7 @@
 #include <linux/string.h>
 #include <linux/stringify.h>
 #include <linux/workqueue.h>
+#include <uapi/linux/batadv_packet.h>
 #include "bridge_loop_avoidance.h"
 #include "distributed-arp-table.h"
@@ -47,7 +48,6 @@
 #include "hard-interface.h"
 #include "log.h"
 #include "network-coding.h"
-#include "packet.h"
 #include "soft-interface.h"
 static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 7dcf2aa4deb5..8b576712d0c1 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -49,13 +49,13 @@
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "hard-interface.h"
 #include "log.h"
 #include "netlink.h"
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 /**
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 0e53be3f8df0..7550a9ccd695 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -52,6 +52,7 @@
 #include <net/genetlink.h>
 #include <net/netlink.h>
 #include <net/sock.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
 #include "bridge_loop_avoidance.h"
@@ -60,7 +61,6 @@
 #include "log.h"
 #include "netlink.h"
 #include "originator.h"
-#include "packet.h"
 #include "soft-interface.h"
 #include "tvlv.h"
diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c
index e189f026974c..5ffcb45ac6ff 100644
--- a/net/batman-adv/tvlv.c
+++ b/net/batman-adv/tvlv.c
@@ -36,9 +36,9 @@
 #include <linux/stddef.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <uapi/linux/batadv_packet.h>
 #include "originator.h"
-#include "packet.h"
 #include "send.h"
 #include "tvlv.h"
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 77b145eba193..bb1578410e0c 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -35,10 +35,9 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <uapi/linux/batadv_packet.h>
 #include <uapi/linux/batman_adv.h>
-#include "packet.h"
 struct seq_file;
 #ifdef CONFIG_BATMAN_ADV_DAT
author	Sven Eckelmann <sven.eckelmann@openmesh.com>	2017-12-21 04:17:41 -0500
committer	David S. Miller <davem@davemloft.net>	2017-12-21 15:35:53 -0500
commit	fec149f5d3234c037ec761d1db4cc8c0550e9964 (patch)
tree	1305e39ca26f665f14ecfdc230c6d54f1e17d769
parent	adbf9b7324e7cb734e876cd311392c0880e890f7 (diff)

diff --git a/MAINTAINERS b/MAINTAINERS index 129c591e0f34..753799d24cd9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -2564,6 +2564,7 @@ S: Maintained
2564	F: Documentation/ABI/testing/sysfs-class-net-batman-adv	2564	F: Documentation/ABI/testing/sysfs-class-net-batman-adv
2565	F: Documentation/ABI/testing/sysfs-class-net-mesh	2565	F: Documentation/ABI/testing/sysfs-class-net-mesh
2566	F: Documentation/networking/batman-adv.rst	2566	F: Documentation/networking/batman-adv.rst
		2567	F: include/uapi/linux/batadv_packet.h
2567	F: include/uapi/linux/batman_adv.h	2568	F: include/uapi/linux/batman_adv.h
2568	F: net/batman-adv/	2569	F: net/batman-adv/
2569		2570


diff --git a/net/batman-adv/packet.h b/include/uapi/linux/batadv_packet.h index 3b2d2db993aa..5cb360be2a11 100644 --- a/net/batman-adv/packet.h +++ b/include/uapi/linux/batadv_packet.h
@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
2	/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:	2	/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
3	*	3	*
4	* Marek Lindner, Simon Wunderlich	4	* Marek Lindner, Simon Wunderlich
@@ -16,8 +16,8 @@
16	* along with this program; if not, see <http://www.gnu.org/licenses/>.	16	* along with this program; if not, see <http://www.gnu.org/licenses/>.
17	*/	17	*/
18		18
19	#ifndef _NET_BATMAN_ADV_PACKET_H_	19	#ifndef _UAPI_LINUX_BATADV_PACKET_H_
20	#define _NET_BATMAN_ADV_PACKET_H_	20	#define _UAPI_LINUX_BATADV_PACKET_H_
21		21
22	#include <asm/byteorder.h>	22	#include <asm/byteorder.h>
23	#include <linux/if_ether.h>	23	#include <linux/if_ether.h>
@@ -641,4 +641,4 @@ struct batadv_tvlv_mcast_data {
641	__u8 reserved[3];	641	__u8 reserved[3];
642	};	642	};
643		643
644	#endif /* _NET_BATMAN_ADV_PACKET_H_ */	644	#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */


diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 84c36430c25a..79e326383726 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c
@@ -52,6 +52,7 @@
52	#include <linux/workqueue.h>	52	#include <linux/workqueue.h>
53	#include <net/genetlink.h>	53	#include <net/genetlink.h>
54	#include <net/netlink.h>	54	#include <net/netlink.h>
		55	#include <uapi/linux/batadv_packet.h>
55	#include <uapi/linux/batman_adv.h>	56	#include <uapi/linux/batman_adv.h>
56		57
57	#include "bat_algo.h"	58	#include "bat_algo.h"
@@ -63,7 +64,6 @@
63	#include "netlink.h"	64	#include "netlink.h"
64	#include "network-coding.h"	65	#include "network-coding.h"
65	#include "originator.h"	66	#include "originator.h"
66	#include "packet.h"
67	#include "routing.h"	67	#include "routing.h"
68	#include "send.h"	68	#include "send.h"
69	#include "translation-table.h"	69	#include "translation-table.h"


diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 78ddf3afa83a..27e165ac9302 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c
@@ -37,6 +37,7 @@
37	#include <linux/workqueue.h>	37	#include <linux/workqueue.h>
38	#include <net/genetlink.h>	38	#include <net/genetlink.h>
39	#include <net/netlink.h>	39	#include <net/netlink.h>
		40	#include <uapi/linux/batadv_packet.h>
40	#include <uapi/linux/batman_adv.h>	41	#include <uapi/linux/batman_adv.h>
41		42
42	#include "bat_algo.h"	43	#include "bat_algo.h"
@@ -49,7 +50,6 @@
49	#include "log.h"	50	#include "log.h"
50	#include "netlink.h"	51	#include "netlink.h"
51	#include "originator.h"	52	#include "originator.h"
52	#include "packet.h"
53		53
54	struct sk_buff;	54	struct sk_buff;
55		55


diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 59ae96cef596..a83478c46597 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c
@@ -42,13 +42,13 @@
42	#include <linux/types.h>	42	#include <linux/types.h>
43	#include <linux/workqueue.h>	43	#include <linux/workqueue.h>
44	#include <net/cfg80211.h>	44	#include <net/cfg80211.h>
		45	#include <uapi/linux/batadv_packet.h>
45		46
46	#include "bat_algo.h"	47	#include "bat_algo.h"
47	#include "bat_v_ogm.h"	48	#include "bat_v_ogm.h"
48	#include "hard-interface.h"	49	#include "hard-interface.h"
49	#include "log.h"	50	#include "log.h"
50	#include "originator.h"	51	#include "originator.h"
51	#include "packet.h"
52	#include "routing.h"	52	#include "routing.h"
53	#include "send.h"	53	#include "send.h"
54		54


diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index e415974c540d..ba59b77c605d 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c
@@ -39,13 +39,13 @@
39	#include <linux/string.h>	39	#include <linux/string.h>
40	#include <linux/types.h>	40	#include <linux/types.h>
41	#include <linux/workqueue.h>	41	#include <linux/workqueue.h>
		42	#include <uapi/linux/batadv_packet.h>
42		43
43	#include "bat_algo.h"	44	#include "bat_algo.h"
44	#include "hard-interface.h"	45	#include "hard-interface.h"
45	#include "hash.h"	46	#include "hash.h"
46	#include "log.h"	47	#include "log.h"
47	#include "originator.h"	48	#include "originator.h"
48	#include "packet.h"
49	#include "routing.h"	49	#include "routing.h"
50	#include "send.h"	50	#include "send.h"
51	#include "translation-table.h"	51	#include "translation-table.h"


diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index e647450e5d0f..fad47853ad3c 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -50,6 +50,7 @@
50	#include <net/genetlink.h>	50	#include <net/genetlink.h>
51	#include <net/netlink.h>	51	#include <net/netlink.h>
52	#include <net/sock.h>	52	#include <net/sock.h>
		53	#include <uapi/linux/batadv_packet.h>
53	#include <uapi/linux/batman_adv.h>	54	#include <uapi/linux/batman_adv.h>
54		55
55	#include "hard-interface.h"	56	#include "hard-interface.h"
@@ -57,7 +58,6 @@
57	#include "log.h"	58	#include "log.h"
58	#include "netlink.h"	59	#include "netlink.h"
59	#include "originator.h"	60	#include "originator.h"
60	#include "packet.h"
61	#include "soft-interface.h"	61	#include "soft-interface.h"
62	#include "sysfs.h"	62	#include "sysfs.h"
63	#include "translation-table.h"	63	#include "translation-table.h"


diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 3d47bedaf661..12897eb46268 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h
@@ -24,9 +24,9 @@
24	#include <linux/compiler.h>	24	#include <linux/compiler.h>
25	#include <linux/netdevice.h>	25	#include <linux/netdevice.h>
26	#include <linux/types.h>	26	#include <linux/types.h>
		27	#include <uapi/linux/batadv_packet.h>
27		28
28	#include "originator.h"	29	#include "originator.h"
29	#include "packet.h"
30		30
31	struct seq_file;	31	struct seq_file;
32	struct sk_buff;	32	struct sk_buff;


diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 4979350af9a7..22dde42fd80e 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c
@@ -33,10 +33,10 @@
33	#include <linux/slab.h>	33	#include <linux/slab.h>
34	#include <linux/spinlock.h>	34	#include <linux/spinlock.h>
35	#include <linux/string.h>	35	#include <linux/string.h>
		36	#include <uapi/linux/batadv_packet.h>
36		37
37	#include "hard-interface.h"	38	#include "hard-interface.h"
38	#include "originator.h"	39	#include "originator.h"
39	#include "packet.h"
40	#include "routing.h"	40	#include "routing.h"
41	#include "send.h"	41	#include "send.h"
42	#include "soft-interface.h"	42	#include "soft-interface.h"


diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 2488e25d0eef..37fe9a644f22 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c
@@ -43,6 +43,7 @@
43	#include <linux/stddef.h>	43	#include <linux/stddef.h>
44	#include <linux/udp.h>	44	#include <linux/udp.h>
45	#include <net/sock.h>	45	#include <net/sock.h>
		46	#include <uapi/linux/batadv_packet.h>
46	#include <uapi/linux/batman_adv.h>	47	#include <uapi/linux/batman_adv.h>
47		48
48	#include "gateway_common.h"	49	#include "gateway_common.h"
@@ -50,7 +51,6 @@
50	#include "log.h"	51	#include "log.h"
51	#include "netlink.h"	52	#include "netlink.h"
52	#include "originator.h"	53	#include "originator.h"
53	#include "packet.h"
54	#include "routing.h"	54	#include "routing.h"
55	#include "soft-interface.h"	55	#include "soft-interface.h"
56	#include "sysfs.h"	56	#include "sysfs.h"


diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 83bfeecf661c..b3e156af2256 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c
@@ -27,10 +27,10 @@
27	#include <linux/netdevice.h>	27	#include <linux/netdevice.h>
28	#include <linux/stddef.h>	28	#include <linux/stddef.h>
29	#include <linux/string.h>	29	#include <linux/string.h>
		30	#include <uapi/linux/batadv_packet.h>
30		31
31	#include "gateway_client.h"	32	#include "gateway_client.h"
32	#include "log.h"	33	#include "log.h"
33	#include "packet.h"
34	#include "tvlv.h"	34	#include "tvlv.h"
35		35
36	/**	36	/**


diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 13d04dba0b3a..5f186bff284a 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c
@@ -38,6 +38,7 @@
38	#include <linux/spinlock.h>	38	#include <linux/spinlock.h>
39	#include <net/net_namespace.h>	39	#include <net/net_namespace.h>
40	#include <net/rtnetlink.h>	40	#include <net/rtnetlink.h>
		41	#include <uapi/linux/batadv_packet.h>
41		42
42	#include "bat_v.h"	43	#include "bat_v.h"
43	#include "bridge_loop_avoidance.h"	44	#include "bridge_loop_avoidance.h"
@@ -46,7 +47,6 @@
46	#include "gateway_client.h"	47	#include "gateway_client.h"
47	#include "log.h"	48	#include "log.h"
48	#include "originator.h"	49	#include "originator.h"
49	#include "packet.h"
50	#include "send.h"	50	#include "send.h"
51	#include "soft-interface.h"	51	#include "soft-interface.h"
52	#include "sysfs.h"	52	#include "sysfs.h"


diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index f2ef75b7fa73..8041cf106c37 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c
@@ -44,11 +44,11 @@
44	#include <linux/string.h>	44	#include <linux/string.h>
45	#include <linux/uaccess.h>	45	#include <linux/uaccess.h>
46	#include <linux/wait.h>	46	#include <linux/wait.h>
		47	#include <uapi/linux/batadv_packet.h>
47		48
48	#include "hard-interface.h"	49	#include "hard-interface.h"
49	#include "log.h"	50	#include "log.h"
50	#include "originator.h"	51	#include "originator.h"
51	#include "packet.h"
52	#include "send.h"	52	#include "send.h"
53		53
54	static struct batadv_socket_client *batadv_socket_client_hash[256];	54	static struct batadv_socket_client *batadv_socket_client_hash[256];


diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8bee4279d579..d31c8266e244 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c
@@ -46,6 +46,7 @@
46	#include <linux/workqueue.h>	46	#include <linux/workqueue.h>
47	#include <net/dsfield.h>	47	#include <net/dsfield.h>
48	#include <net/rtnetlink.h>	48	#include <net/rtnetlink.h>
		49	#include <uapi/linux/batadv_packet.h>
49	#include <uapi/linux/batman_adv.h>	50	#include <uapi/linux/batman_adv.h>
50		51
51	#include "bat_algo.h"	52	#include "bat_algo.h"
@@ -63,7 +64,6 @@
63	#include "netlink.h"	64	#include "netlink.h"
64	#include "network-coding.h"	65	#include "network-coding.h"
65	#include "originator.h"	66	#include "originator.h"
66	#include "packet.h"
67	#include "routing.h"	67	#include "routing.h"
68	#include "send.h"	68	#include "send.h"
69	#include "soft-interface.h"	69	#include "soft-interface.h"


diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index d5484ac381d3..f7ba3f96d8f3 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h
@@ -223,8 +223,8 @@ enum batadv_uev_type {
223	#include <linux/jiffies.h>	223	#include <linux/jiffies.h>
224	#include <linux/percpu.h>	224	#include <linux/percpu.h>
225	#include <linux/types.h>	225	#include <linux/types.h>
		226	#include <uapi/linux/batadv_packet.h>
226		227
227	#include "packet.h"
228	#include "types.h"	228	#include "types.h"
229		229
230	struct net_device;	230	struct net_device;


diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8a503c526b90..cbdeb47ec3f6 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c
@@ -55,11 +55,11 @@
55	#include <net/if_inet6.h>	55	#include <net/if_inet6.h>
56	#include <net/ip.h>	56	#include <net/ip.h>
57	#include <net/ipv6.h>	57	#include <net/ipv6.h>
		58	#include <uapi/linux/batadv_packet.h>
58		59
59	#include "hard-interface.h"	60	#include "hard-interface.h"
60	#include "hash.h"	61	#include "hash.h"
61	#include "log.h"	62	#include "log.h"
62	#include "packet.h"
63	#include "translation-table.h"	63	#include "translation-table.h"
64	#include "tvlv.h"	64	#include "tvlv.h"
65		65


diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 103d4bdcdbdb..a823d3899bad 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c
@@ -40,6 +40,7 @@
40	#include <net/genetlink.h>	40	#include <net/genetlink.h>
41	#include <net/netlink.h>	41	#include <net/netlink.h>
42	#include <net/sock.h>	42	#include <net/sock.h>
		43	#include <uapi/linux/batadv_packet.h>
43	#include <uapi/linux/batman_adv.h>	44	#include <uapi/linux/batman_adv.h>
44		45
45	#include "bat_algo.h"	46	#include "bat_algo.h"
@@ -47,7 +48,6 @@
47	#include "gateway_client.h"	48	#include "gateway_client.h"
48	#include "hard-interface.h"	49	#include "hard-interface.h"
49	#include "originator.h"	50	#include "originator.h"
50	#include "packet.h"
51	#include "soft-interface.h"	51	#include "soft-interface.h"
52	#include "tp_meter.h"	52	#include "tp_meter.h"
53	#include "translation-table.h"	53	#include "translation-table.h"


diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 3758be7fd881..b48116bb24ef 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c
@@ -49,12 +49,12 @@
49	#include <linux/stddef.h>	49	#include <linux/stddef.h>
50	#include <linux/string.h>	50	#include <linux/string.h>
51	#include <linux/workqueue.h>	51	#include <linux/workqueue.h>
		52	#include <uapi/linux/batadv_packet.h>
52		53
53	#include "hard-interface.h"	54	#include "hard-interface.h"
54	#include "hash.h"	55	#include "hash.h"
55	#include "log.h"	56	#include "log.h"
56	#include "originator.h"	57	#include "originator.h"
57	#include "packet.h"
58	#include "routing.h"	58	#include "routing.h"
59	#include "send.h"	59	#include "send.h"
60	#include "tvlv.h"	60	#include "tvlv.h"


diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index eb835bde502a..b6891e8b741c 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c
@@ -34,6 +34,7 @@
34	#include <linux/skbuff.h>	34	#include <linux/skbuff.h>
35	#include <linux/spinlock.h>	35	#include <linux/spinlock.h>
36	#include <linux/stddef.h>	36	#include <linux/stddef.h>
		37	#include <uapi/linux/batadv_packet.h>
37		38
38	#include "bitarray.h"	39	#include "bitarray.h"
39	#include "bridge_loop_avoidance.h"	40	#include "bridge_loop_avoidance.h"
@@ -44,7 +45,6 @@
44	#include "log.h"	45	#include "log.h"
45	#include "network-coding.h"	46	#include "network-coding.h"
46	#include "originator.h"	47	#include "originator.h"
47	#include "packet.h"
48	#include "send.h"	48	#include "send.h"
49	#include "soft-interface.h"	49	#include "soft-interface.h"
50	#include "tp_meter.h"	50	#include "tp_meter.h"


diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 8c7399dd06ca..1e8c79093623 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h
@@ -24,8 +24,7 @@
24	#include <linux/compiler.h>	24	#include <linux/compiler.h>
25	#include <linux/spinlock.h>	25	#include <linux/spinlock.h>
26	#include <linux/types.h>	26	#include <linux/types.h>
27		27	#include <uapi/linux/batadv_packet.h>
28	#include "packet.h"
29		28
30	struct sk_buff;	29	struct sk_buff;
31		30


diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 1eb5555c5fe4..900c5ce21cd4 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c
@@ -49,6 +49,7 @@
49	#include <linux/stddef.h>	49	#include <linux/stddef.h>
50	#include <linux/string.h>	50	#include <linux/string.h>
51	#include <linux/types.h>	51	#include <linux/types.h>
		52	#include <uapi/linux/batadv_packet.h>
52		53
53	#include "bat_algo.h"	54	#include "bat_algo.h"
54	#include "bridge_loop_avoidance.h"	55	#include "bridge_loop_avoidance.h"
@@ -60,7 +61,6 @@
60	#include "multicast.h"	61	#include "multicast.h"
61	#include "network-coding.h"	62	#include "network-coding.h"
62	#include "originator.h"	63	#include "originator.h"
63	#include "packet.h"
64	#include "send.h"	64	#include "send.h"
65	#include "sysfs.h"	65	#include "sysfs.h"
66	#include "translation-table.h"	66	#include "translation-table.h"


diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 56fb42551453..c1578fa0b952 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c
@@ -39,6 +39,7 @@
39	#include <linux/string.h>	39	#include <linux/string.h>
40	#include <linux/stringify.h>	40	#include <linux/stringify.h>
41	#include <linux/workqueue.h>	41	#include <linux/workqueue.h>
		42	#include <uapi/linux/batadv_packet.h>
42		43
43	#include "bridge_loop_avoidance.h"	44	#include "bridge_loop_avoidance.h"
44	#include "distributed-arp-table.h"	45	#include "distributed-arp-table.h"
@@ -47,7 +48,6 @@
47	#include "hard-interface.h"	48	#include "hard-interface.h"
48	#include "log.h"	49	#include "log.h"
49	#include "network-coding.h"	50	#include "network-coding.h"
50	#include "packet.h"
51	#include "soft-interface.h"	51	#include "soft-interface.h"
52		52
53	static struct net_device batadv_kobj_to_netdev(struct kobject obj)	53	static struct net_device batadv_kobj_to_netdev(struct kobject obj)


diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 7dcf2aa4deb5..8b576712d0c1 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c
@@ -49,13 +49,13 @@
49	#include <linux/timer.h>	49	#include <linux/timer.h>
50	#include <linux/wait.h>	50	#include <linux/wait.h>
51	#include <linux/workqueue.h>	51	#include <linux/workqueue.h>
		52	#include <uapi/linux/batadv_packet.h>
52	#include <uapi/linux/batman_adv.h>	53	#include <uapi/linux/batman_adv.h>
53		54
54	#include "hard-interface.h"	55	#include "hard-interface.h"
55	#include "log.h"	56	#include "log.h"
56	#include "netlink.h"	57	#include "netlink.h"
57	#include "originator.h"	58	#include "originator.h"
58	#include "packet.h"
59	#include "send.h"	59	#include "send.h"
60		60
61	/**	61	/**


diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0e53be3f8df0..7550a9ccd695 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c
@@ -52,6 +52,7 @@
52	#include <net/genetlink.h>	52	#include <net/genetlink.h>
53	#include <net/netlink.h>	53	#include <net/netlink.h>
54	#include <net/sock.h>	54	#include <net/sock.h>
		55	#include <uapi/linux/batadv_packet.h>
55	#include <uapi/linux/batman_adv.h>	56	#include <uapi/linux/batman_adv.h>
56		57
57	#include "bridge_loop_avoidance.h"	58	#include "bridge_loop_avoidance.h"
@@ -60,7 +61,6 @@
60	#include "log.h"	61	#include "log.h"
61	#include "netlink.h"	62	#include "netlink.h"
62	#include "originator.h"	63	#include "originator.h"
63	#include "packet.h"
64	#include "soft-interface.h"	64	#include "soft-interface.h"
65	#include "tvlv.h"	65	#include "tvlv.h"
66		66


diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index e189f026974c..5ffcb45ac6ff 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c
@@ -36,9 +36,9 @@
36	#include <linux/stddef.h>	36	#include <linux/stddef.h>
37	#include <linux/string.h>	37	#include <linux/string.h>
38	#include <linux/types.h>	38	#include <linux/types.h>
		39	#include <uapi/linux/batadv_packet.h>
39		40
40	#include "originator.h"	41	#include "originator.h"
41	#include "packet.h"
42	#include "send.h"	42	#include "send.h"
43	#include "tvlv.h"	43	#include "tvlv.h"
44		44


diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 77b145eba193..bb1578410e0c 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h
@@ -35,10 +35,9 @@
35	#include <linux/types.h>	35	#include <linux/types.h>
36	#include <linux/wait.h>	36	#include <linux/wait.h>
37	#include <linux/workqueue.h>	37	#include <linux/workqueue.h>
		38	#include <uapi/linux/batadv_packet.h>
38	#include <uapi/linux/batman_adv.h>	39	#include <uapi/linux/batman_adv.h>
39		40
40	#include "packet.h"
41
42	struct seq_file;	41	struct seq_file;
43		42
44	#ifdef CONFIG_BATMAN_ADV_DAT	43	#ifdef CONFIG_BATMAN_ADV_DAT