Skip to contentSkip to conversation

batman-adv: Drop prandom.h includes

PATCH New Sven Eckelmann 1 participant 1 message Jan 7, 2023 Batman advanced

lore
Share & tools
lore

Sven Eckelmann

author maintainer
#0 lore raw

PATCH v2 1/1 batman-adv: Drop prandom.h includes

The commit a15d3f3c1c2a ("batman-adv: use get_random_u32_below() instead of deprecated function") replaced the prandom.h function prandom_u32_max with the random.h function get_random_u32_below. There is no need to still include prandom.h.

---
v2:
- Fix conflicts with the Linux < 4.14 compat code removal
- directly integrate "batman-adv: Include random.h for get_random_u32_below" into the first patch

---
 compat-include/linux/prandom.h  | 24 ------------------------
 net/batman-adv/bat_iv_ogm.c     |  1 -
 net/batman-adv/bat_v_elp.c      |  1 -
 net/batman-adv/bat_v_ogm.c      |  1 -
 net/batman-adv/network-coding.c |  2 +-
 5 files changed, 1 insertion(+), 28 deletions(-)
compat-include/linux/prandom.h deleted +0 -24
deleted file mode 100644
index ec2f5244..00000000
@@ -1,24 +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_PRANDOM_H_
-#define _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_
-
-#include <linux/version.h>
-#if LINUX_VERSION_IS_GEQ(5, 8, 1) || \
-    (LINUX_VERSION_IS_GEQ(4, 14, 193) && LINUX_VERSION_IS_LESS(4, 15, 0)) || \
-    (LINUX_VERSION_IS_GEQ(4, 19, 138) && LINUX_VERSION_IS_LESS(4, 20, 0)) || \
-    (LINUX_VERSION_IS_GEQ(5, 4, 57) && LINUX_VERSION_IS_LESS(5, 5, 0)) || \
-    (LINUX_VERSION_IS_GEQ(5, 7, 14) && LINUX_VERSION_IS_LESS(5, 8, 0))
-#include_next <linux/prandom.h>
-#else
-#include <linux/random.h>
-#endif
-
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ */
net/batman-adv/bat_iv_ogm.c +0 -1
index 114ee5da..828fb393 100644
@@ -27,7 +27,6 @@
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
 #include <linux/pkt_sched.h>
-#include <linux/prandom.h>
 #include <linux/printk.h>
 #include <linux/random.h>
 #include <linux/rculist.h>
net/batman-adv/bat_v_elp.c +0 -1
index f9a58fb5..acff5658 100644
@@ -21,7 +21,6 @@
 #include <linux/minmax.h>
 #include <linux/netdevice.h>
 #include <linux/nl80211.h>
-#include <linux/prandom.h>
 #include <linux/random.h>
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
net/batman-adv/bat_v_ogm.c +0 -1
index addfd8c4..96e02736 100644
@@ -21,7 +21,6 @@
 #include <linux/minmax.h>
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
-#include <linux/prandom.h>
 #include <linux/random.h>
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
net/batman-adv/network-coding.c +1 -1
index bf29fba4..ecd871ab 100644
@@ -25,8 +25,8 @@
 #include <linux/lockdep.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
-#include <linux/prandom.h>
 #include <linux/printk.h>
+#include <linux/random.h>
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
 #include <linux/skbuff.h>

---
base-commit: d364e8168b28b345f39c3f77526a2d71a28c282e
change-id: 20230107-headers-055722c77349

Best regards,

Signature · 1 line
Sven Eckelmann <[email protected]>