Commit e4a096d1 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Zicheng Qu
Browse files

batman-adv: Add new include for min/max helpers 

mainline inclusion
from mainline-v5.11-rc1
commit fcd193e1
category: other
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBPLJA
CVE: CVE-2025-21823

Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fcd193e1dfa6842e2783b04d98345767fe99cf31



--------------------------------

The commit b296a6d5 ("kernel.h: split out min()/max() et al. helpers")
moved the min/max helper functionality from kernel.h to minmax.h. Adjust
the kernel code accordingly to avoid fragile indirect includes.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarZicheng Qu <quzicheng@huawei.com>
parent d2347dd0

net/batman-adv/bat_v.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/minmax.h>

#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <linux/rculist.h>

net/batman-adv/bat_v_elp.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/minmax.h>

#include <linux/netdevice.h>

#include <linux/nl80211.h>

#include <linux/prandom.h>

net/batman-adv/bat_v_ogm.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/kref.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/minmax.h>

#include <linux/mutex.h>

#include <linux/netdevice.h>

#include <linux/prandom.h>

net/batman-adv/fragmentation.c

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/gfp.h>

#include <linux/if_ether.h>

#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/lockdep.h>

#include <linux/minmax.h>

#include <linux/netdevice.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

net/batman-adv/hard-interface.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/kref.h>

#include <linux/limits.h>

#include <linux/list.h>

#include <linux/minmax.h>

#include <linux/mutex.h>

#include <linux/netdevice.h>

#include <linux/printk.h>