From: Matthias Schiffer Date: Tue, 8 Apr 2025 15:53:36 +0000 (+0200) Subject: batman-adv: constify and move broadcast addr definition X-Git-Tag: v6.16-rc1~132^2~139^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d699628dae07038cf21fe288ac00c0a0062b4e0d;p=thirdparty%2Fkernel%2Flinux.git batman-adv: constify and move broadcast addr definition The variable is used only once and is read-only. Make it a const local variable. Signed-off-by: Matthias Schiffer Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a08132888a3d4..e41f816f0887b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -69,8 +69,6 @@ unsigned int batadv_hardif_generation; static int (*batadv_rx_handler[256])(struct sk_buff *skb, struct batadv_hard_iface *recv_if); -unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - struct workqueue_struct *batadv_event_workqueue; static void batadv_recv_handler_init(void); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 4b5ce8972848a..692109be22101 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -235,7 +235,6 @@ static inline int batadv_print_vid(unsigned short vid) extern struct list_head batadv_hardif_list; extern unsigned int batadv_hardif_generation; -extern unsigned char batadv_broadcast_addr[]; extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *mesh_iface); diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 735ac80778219..9d72f4f15b3d7 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -124,7 +124,9 @@ send_skb_err: int batadv_send_broadcast_skb(struct sk_buff *skb, struct batadv_hard_iface *hard_iface) { - return batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); + static const u8 broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + + return batadv_send_skb_packet(skb, hard_iface, broadcast_addr); } /**