From patchwork Tue Jan 9 21:58:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 18615 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 267FD83EA6 for ; Tue, 9 Jan 2024 22:59:47 +0100 (CET) ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=open-mesh.org; s=20121; t=1704837587; b=L6eDB1xJhS3dccrMu4WKTjaABFGBZrqAkuhFc8sdxGFmuIoEzQRdAWALLk6lQEVKZRs2s mh+ZVk80nMegyJaTSCJUXqKeSmiVFJ4R+aouv0dYFDSc/nO5Fm5wCmWSfhP+QxEsi/FuLb1 QTLImtkfAZK5GYaR/8TQbYTIuLUt8tI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1704837587; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=hkr+J7jo6JjmBfD5s3vq0pEW4afEHT6aDUhk62eajM8=; b=eMeNvw1SAt8sZSPbyg9NxdarhQswt5npxMSys2F9ERpT09veQKa2IhQMu8UbtZzoDa2yC fxQtsG+fGYYzYY1LlHbLvmuPE28FzlRqCekmS+mePU5QaE8fuS2HjjoHsn7bO42OmkGye5g /KijBpFzvsjPIx/nqyt2rFqkru8nmm0= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=pass; dmarc=none Authentication-Results: open-mesh.org; dkim=fail; arc=pass; dmarc=none Received: from mail.aperture-lab.de (mail.aperture-lab.de [116.203.183.178]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 74B7A80C67 for ; Tue, 9 Jan 2024 22:59:06 +0100 (CET) ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1704837546; a=rsa-sha256; cv=none; b=WOkUTcwabi98gCLPiUxGbEDe2LaJTs5YlNssgPyuA45VGIKPjVn8nyugQbV1iCmVr2fVNV UAbLHW9dHjSfvoHs9QFNbCqFTs3QMqu5RUG7dQ58g65T0rUPSOJYCCNZRMLdHLDl0fOiaE 6MntcyRwGdHa0Mp2ycPXTAVd+8wAvis= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; dmarc=none; spf=pass (diktynna.open-mesh.org: domain of linus.luessing@c0d3.blue designates 116.203.183.178 as permitted sender) smtp.mailfrom=linus.luessing@c0d3.blue ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1704837546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hkr+J7jo6JjmBfD5s3vq0pEW4afEHT6aDUhk62eajM8=; b=0tneH2i84ujCfS2VAShHuT97H9OH+SURVD9U8AEdf0uy11CjGW0TEFFxGsmTPVyUkDYEYt 1G8Iqrp0HE4woDSjgbkTUo+XHCbYWa07rvXhYEGPJoxetytK4jRpFoEbssR2xaWOJ6PLYx AFBdk+kQMuneoq4cQSGvZojuqG12VdA= Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BADFA40847; Tue, 9 Jan 2024 22:59:05 +0100 (CET) From: =?utf-8?q?Linus_L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Cc: =?utf-8?q?Linus_L=C3=BCssing?= Subject: [PATCH] batman-adv: mcast: fix mcast packet type counter on timeouted nodes Date: Tue, 9 Jan 2024 22:58:59 +0100 Message-ID: <20240109215900.5767-1-linus.luessing@c0d3.blue> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Message-ID-Hash: 7GH3J32Z7XDOX2526YM22LOK6VVMHIOF X-Message-ID-Hash: 7GH3J32Z7XDOX2526YM22LOK6VVMHIOF X-MailFrom: linus.luessing@c0d3.blue X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; header-match-b.a.t.m.a.n.lists.open-mesh.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When a node which does not have the new batman-adv multicast packet type capability vanishes then the according, global counter erroneously would not be reduced in response on other nodes. Which in turn leads to the mesh never switching back to sending with the new multicast packet type. Fix this by reducing the according counter when such a node times out. Fixes: be9b0169c840 ("batman-adv: mcast: implement multicast packet generation") Signed-off-by: Linus Lüssing --- net/batman-adv/multicast.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 2981a2ed40cb..c8620905c2dc 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2206,6 +2206,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) BATADV_MCAST_WANT_NO_RTR4); batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_MCAST_WANT_NO_RTR6); + batadv_mcast_have_mc_ptype_update(bat_priv, orig, + BATADV_MCAST_HAVE_MC_PTYPE_CAPA); spin_unlock_bh(&orig->mcast_handler_lock); }