From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.simonwunderlich.de (mail.simonwunderlich.de [23.88.38.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0A6637DAC0 for ; Tue, 30 Jun 2026 14:06:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.88.38.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782828392; cv=none; b=PijX7km7jLZbrS/1cwjKAkjScb5kWqJaOb1rvRnZ3S6uPvqxcQoFH6Epgby2mWAC29WYdRnaJBIAysmwV6QpQGD68/DJDenrbK8ld0B41Sct8CxH8TVx4XngAnQ8oy7/wi9Q4rTjGe1EJ4U4WpoFlaKxufPo9t4ioDguCGWpgiU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782828392; c=relaxed/simple; bh=wNJTsQLgvpoVsoqku4OQ4HNqxJVP6VielYa4usPY2U4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p4opiq9P/rFJ+jJN8a+fTtM0CBwSeUBeSNT0+9Uu4WAv5ELgMZtu7TZvFyFUaqKyeQrCFsL9pwLZR+JWE4JGYd1uUtwfGiRlVTd9fqlJK7VK4GaRsN+2Q+gJAt82Vcs0G2y4v24M6MkmtXdOf+tgYnCnEb76jYbyQiVrKDGEnXY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=simonwunderlich.de; spf=pass smtp.mailfrom=simonwunderlich.de; dkim=pass (2048-bit key) header.d=simonwunderlich.de header.i=@simonwunderlich.de header.b=EYwr9Mvl; arc=none smtp.client-ip=23.88.38.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=simonwunderlich.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=simonwunderlich.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=simonwunderlich.de header.i=@simonwunderlich.de header.b="EYwr9Mvl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=simonwunderlich.de; s=09092022; t=1782828388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2ggBIdg8rkxmGr9wpuXuxDPN7SUh0MWGWJtEbC8CXc=; b=EYwr9MvlYxDDuJf2gM1UBLpuuWI4zNtFrOeaMGe1dN53zlc6iOaRqXK4/vEAqIMyEklPyl zm+mL0116sTBI8zB37lB7T9J/alGl85nBOsA+WyZhyPj9tqAaDpvEMjmWL+CL/QLdFjjK0 AyvMzfmlt5usv7by065KNiZkvoLW0i6PhdCTD6SjULeS3VYSLlDWv/pQhI+FGXt3mdSBj8 BXJMrJiMIVT3ISAgPQ6F9wb/flcMqlQJ3dyFKOj+hVNg+ueo956aZM7hWpdzHzRmy+P90L vjBhpDajnxAm8P5WDd9aJ/PCAfRUKh/DgTszDVNDNPGXjxipmbApPvVeprYJQA== From: Simon Wunderlich To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , b.a.t.m.a.n@lists.open-mesh.org, Nora Schiffer , Sven Eckelmann , Simon Wunderlich Subject: [PATCH net-next 05/15] batman-adv: move hardif generation counter into batadv_priv Date: Tue, 30 Jun 2026 16:06:13 +0200 Message-ID: <20260630140623.88431-6-sw@simonwunderlich.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260630140623.88431-1-sw@simonwunderlich.de> References: <20260630140623.88431-1-sw@simonwunderlich.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nora Schiffer The counter doesn't need to be global. Signed-off-by: Nora Schiffer Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/hard-interface.c | 4 ++-- net/batman-adv/main.c | 1 - net/batman-adv/main.h | 2 -- net/batman-adv/netlink.c | 2 +- net/batman-adv/types.h | 3 +++ 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 86010bc32818e..9b8108d464dbc 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -774,7 +774,7 @@ int batadv_hardif_enable_interface(struct net_device *net_dev, hard_iface->mesh_iface = mesh_iface; bat_priv = netdev_priv(hard_iface->mesh_iface); - batadv_hardif_generation++; + bat_priv->hardif_generation++; ret = netdev_master_upper_dev_link(hard_iface->net_dev, mesh_iface, hard_iface, NULL, NULL); if (ret) @@ -865,7 +865,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) batadv_purge_orig_ref(bat_priv); batadv_purge_outstanding_packets(bat_priv, hard_iface); - batadv_hardif_generation++; + bat_priv->hardif_generation++; netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->mesh_iface); batadv_hardif_recalc_extra_skbroom(hard_iface->mesh_iface); diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 1d82f3a841a1b..badc1df0af1d5 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -59,7 +59,6 @@ #include "tp_meter.h" #include "translation-table.h" -unsigned int batadv_hardif_generation; static int (*batadv_rx_handler[256])(struct sk_buff *skb, struct batadv_hard_iface *recv_if); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index e34145047a341..e738758ee4a7a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -226,8 +226,6 @@ static inline int batadv_print_vid(unsigned short vid) return -1; } -extern unsigned int batadv_hardif_generation; - extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *mesh_iface); diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 62ea91aa3ead6..d2bc48c707143 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -968,7 +968,7 @@ batadv_netlink_dump_hardif(struct sk_buff *msg, struct netlink_callback *cb) bat_priv = netdev_priv(mesh_iface); rtnl_lock(); - cb->seq = batadv_hardif_generation << 1 | 1; + cb->seq = bat_priv->hardif_generation << 1 | 1; netdev_for_each_lower_private(mesh_iface, hard_iface, iter) { if (i++ < skip) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 1671380b37929..e1463a029e835 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1676,6 +1676,9 @@ struct batadv_priv { /** @tp_num: number of currently active tp sessions */ atomic_t tp_num; + /** @hardif_generation: generation counter added to netlink hardif dumps */ + unsigned int hardif_generation; + /** @orig_work: work queue callback item for orig node purging */ struct delayed_work orig_work; -- 2.47.3