From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41326378D96 for ; Thu, 4 Jun 2026 22:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780613258; cv=none; b=fQb0IuxiY9gGAOKmQoFmm1norW5WN5yt1drUJ/RK4gXHTedGnbP9Ex3k8urQuDOEWRc7Y3ibOfP8g5KDQQH3h/4puYmQEY8ZbBn+E8mz0WdbMSymL5VWE7aR5N1lV8q2MggcD2o3KUyxD7eJsdzZ4uQ47/BwMA7Rhh92/3n0nk8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780613258; c=relaxed/simple; bh=mZnGMPLL65HcRjsIqQjSSFBhPjFd1j5JcJecBX1WXwM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mQMUqoxCpTQMZyhBS4pErisVLxNk2VmB39X6gu7m8/q/BHpRIlJMdIJgNe9hoCLhgy4g+Dlw+f8ivGcA6f30iiOmB+Gduihq6jOMUQdrNva2UEQhEGGIRObgBANi7xY+QylVZRCSeQ9Q7gYMni++ur0x/tHAVc+ApE5HXVjvJFo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=aokRzs4a; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="aokRzs4a" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c860544c077so412903a12.3 for ; Thu, 04 Jun 2026 15:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780613256; x=1781218056; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BPaehixkqGDAreIZNrKXsadKilH5nfmF81fGCUQ3FS0=; b=aokRzs4a7xsCUT5Y0aFB2Ih/lGFz1PpSnJn7dI4NlVDgqKiriTVNN2wEp5ZfQMWj0t 46qUv3ZjHRd58HCx83HGAjYQ2z3MQxySv0olmbfOSqIlG48Of63Q6eDkviNBx4lp3PNT Xdxd0l5lkaOaoM/HQm+PHMrJE+Z980Z3vKoMc+Nqcc9kCCfRUOzqbox+TBRLFjkrBQH1 fvn6RXkPI2voPLq7nWPAJCv62E/4wslc/fWHm8yu7HqLLnIP3qzPek/utD/0OKLblsKb kwd893BrgCCCI/a1YzXkByDM27hc5Uw3zLyubbtsXGfOIXiV0UvPs6NKwO7PU6fUfBZh gEow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780613256; x=1781218056; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BPaehixkqGDAreIZNrKXsadKilH5nfmF81fGCUQ3FS0=; b=bwYofYr5FVBJvOi53Th7kVnePAS8oyF3i2eiA8gRYT40ZdwRvLu/8az4iAFZudzZnr gTxuQu5ZjPwt8/L1GWiF4QeM/BpLcocaqf4j0vYCX4PtdkIloVA7qWH+F+xgttyUDYl0 mXLT5zkvlAQBZfQnCLnXIYv/ZAAQ+vKizQhPR31n4cxHh5L/+YuyvhqHssP4eZWyTlgw FATouvQlrYA8EjIsIWs7CF/wQuipNnU8WPDTlCfKWUfcI44udHpd9fGe30msOq7Te2VK nTzM/+mNf3KIOqDP8e8iRvVjrWbKDYXiiMwGkUMrZeSNCByxa6loBPdq6LaVSwtAX6Dc Na7Q== X-Forwarded-Encrypted: i=1; AFNElJ/+HCo4NEE2Yw55znhO2T0zHiYw1APxYiVwKnfM2ltS1cEJQriMotSnzfsJCWWdfhWaadzLyZs=@vger.kernel.org X-Gm-Message-State: AOJu0Yykmdmyuhi6ErDAMSUYiWTqqc83X1a7haNGpW+0L60l8kkgz4mH PWd5wPlmVQRaqvyq1gUWjuYhAyKsQHbnuWiKSaaAj8hsLUn8OEFU+NL4qcJp6Uk/vQL1lD8pG/H L1kMDog== X-Received: from pgbcm4.prod.google.com ([2002:a05:6a02:a04:b0:c79:22b6:a344]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:1409:b0:3b2:8685:1473 with SMTP id adf61e73a8af0-3b4ccd00069mr1059039637.7.1780613256428; Thu, 04 Jun 2026 15:47:36 -0700 (PDT) Date: Thu, 4 Jun 2026 22:46:33 +0000 In-Reply-To: <20260604224712.3209821-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260604224712.3209821-1-kuniyu@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260604224712.3209821-16-kuniyu@google.com> Subject: [PATCH v3 net-next 15/15] ip6mr: Define net->ipv6.{ip6mr_notifier_ops,ipmr_seq} under CONFIG_IPV6_MROUTE. From: Kuniyuki Iwashima To: "David S . Miller" , David Ahern , Eric Dumazet , Ido Schimmel , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" net->ipv6.ip6mr_notifier_ops and net->ipv6.ipmr_seq are used only in net/ipv6/ip6mr.c. Let's move these definitions under CONFIG_IPV6_MROUTE. Signed-off-by: Kuniyuki Iwashima --- include/net/netns/ipv6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 668f10498c5c..ffda15318be5 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -112,14 +112,14 @@ struct netns_ipv6 { struct list_head mr6_tables; struct fib_rules_ops *mr6_rules_ops; #endif + struct fib_notifier_ops *ip6mr_notifier_ops; + atomic_t ipmr_seq; struct mutex mfc_mutex; #endif atomic_t dev_addr_genid; atomic_t fib6_sernum; struct seg6_pernet_data *seg6_data; struct fib_notifier_ops *notifier_ops; - struct fib_notifier_ops *ip6mr_notifier_ops; - atomic_t ipmr_seq; int flowlabel_count; struct { struct hlist_head head; -- 2.54.0.1032.g2f8565e1d1-goog