271 lines
7.4 KiB
Diff
271 lines
7.4 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Fri, 6 May 2022 22:03:29 +0200
|
|
Subject: Revert "batman-adv: Migrate to linux/container_of.h"
|
|
|
|
This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
|
|
|
|
--- a/compat-include/linux/container_of.h
|
|
+++ /dev/null
|
|
@@ -1,20 +0,0 @@
|
|
-/* SPDX-License-Identifier: GPL-2.0 */
|
|
-/* Copyright (C) B.A.T.M.A.N. contributors:
|
|
- *
|
|
- * Marek Lindner, Simon Wunderlich
|
|
- *
|
|
- * This file contains macros for maintaining compatibility with older versions
|
|
- * of the Linux kernel.
|
|
- */
|
|
-
|
|
-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_
|
|
-#define _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_
|
|
-
|
|
-#include <linux/version.h>
|
|
-#if LINUX_VERSION_IS_GEQ(5, 16, 0)
|
|
-#include_next <linux/container_of.h>
|
|
-#else
|
|
-#include <linux/kernel.h>
|
|
-#endif
|
|
-
|
|
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_CONTAINER_OF_H_ */
|
|
--- a/net/batman-adv/bat_iv_ogm.c
|
|
+++ b/net/batman-adv/bat_iv_ogm.c
|
|
@@ -13,13 +13,13 @@
|
|
#include <linux/bug.h>
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/cache.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/init.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/bat_v_elp.c
|
|
+++ b/net/batman-adv/bat_v_elp.c
|
|
@@ -10,13 +10,13 @@
|
|
#include <linux/atomic.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/minmax.h>
|
|
#include <linux/netdevice.h>
|
|
--- a/net/batman-adv/bat_v_ogm.c
|
|
+++ b/net/batman-adv/bat_v_ogm.c
|
|
@@ -9,12 +9,12 @@
|
|
|
|
#include <linux/atomic.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/bridge_loop_avoidance.c
|
|
+++ b/net/batman-adv/bridge_loop_avoidance.c
|
|
@@ -10,7 +10,6 @@
|
|
#include <linux/atomic.h>
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/compiler.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/crc16.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
--- a/net/batman-adv/distributed-arp-table.c
|
|
+++ b/net/batman-adv/distributed-arp-table.c
|
|
@@ -11,7 +11,6 @@
|
|
#include <linux/atomic.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
@@ -21,6 +20,7 @@
|
|
#include <linux/in.h>
|
|
#include <linux/ip.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/netlink.h>
|
|
--- a/net/batman-adv/gateway_client.c
|
|
+++ b/net/batman-adv/gateway_client.c
|
|
@@ -9,7 +9,6 @@
|
|
|
|
#include <linux/atomic.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
--- a/net/batman-adv/hard-interface.c
|
|
+++ b/net/batman-adv/hard-interface.c
|
|
@@ -9,12 +9,12 @@
|
|
|
|
#include <linux/atomic.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/if_ether.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/list.h>
|
|
--- a/net/batman-adv/main.c
|
|
+++ b/net/batman-adv/main.c
|
|
@@ -9,7 +9,6 @@
|
|
#include <linux/atomic.h>
|
|
#include <linux/build_bug.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/crc32c.h>
|
|
#include <linux/device.h>
|
|
#include <linux/errno.h>
|
|
--- a/net/batman-adv/multicast.c
|
|
+++ b/net/batman-adv/multicast.c
|
|
@@ -11,7 +11,6 @@
|
|
#include <linux/bitops.h>
|
|
#include <linux/bug.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
--- a/net/batman-adv/network-coding.c
|
|
+++ b/net/batman-adv/network-coding.c
|
|
@@ -11,7 +11,6 @@
|
|
#include <linux/bitops.h>
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/compiler.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
@@ -20,6 +19,7 @@
|
|
#include <linux/init.h>
|
|
#include <linux/jhash.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/originator.c
|
|
+++ b/net/batman-adv/originator.c
|
|
@@ -8,11 +8,11 @@
|
|
#include "main.h"
|
|
|
|
#include <linux/atomic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/send.c
|
|
+++ b/net/batman-adv/send.c
|
|
@@ -10,13 +10,13 @@
|
|
#include <linux/atomic.h>
|
|
#include <linux/bug.h>
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/netdevice.h>
|
|
--- a/net/batman-adv/soft-interface.c
|
|
+++ b/net/batman-adv/soft-interface.c
|
|
@@ -11,7 +11,6 @@
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/compiler.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
@@ -20,6 +19,7 @@
|
|
#include <linux/if_ether.h>
|
|
#include <linux/if_vlan.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/tp_meter.c
|
|
+++ b/net/batman-adv/tp_meter.c
|
|
@@ -12,13 +12,13 @@
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/compiler.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/err.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/init.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/kthread.h>
|
|
#include <linux/limits.h>
|
|
--- a/net/batman-adv/translation-table.c
|
|
+++ b/net/batman-adv/translation-table.c
|
|
@@ -13,7 +13,6 @@
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/compiler.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/crc32c.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/etherdevice.h>
|
|
@@ -22,6 +21,7 @@
|
|
#include <linux/init.h>
|
|
#include <linux/jhash.h>
|
|
#include <linux/jiffies.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|
|
--- a/net/batman-adv/tvlv.c
|
|
+++ b/net/batman-adv/tvlv.c
|
|
@@ -7,10 +7,10 @@
|
|
#include "main.h"
|
|
|
|
#include <linux/byteorder/generic.h>
|
|
-#include <linux/container_of.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/if_ether.h>
|
|
+#include <linux/kernel.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/list.h>
|
|
#include <linux/lockdep.h>
|