]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ip6mr: Define net->ipv6.{ip6mr_notifier_ops,ipmr_seq} under CONFIG_IPV6_MROUTE.
authorKuniyuki Iwashima <kuniyu@google.com>
Thu, 4 Jun 2026 22:46:33 +0000 (22:46 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 9 Jun 2026 00:06:24 +0000 (17:06 -0700)
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 <kuniyu@google.com>
Link: https://patch.msgid.link/20260604224712.3209821-16-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/net/netns/ipv6.h

index 668f10498c5c77110e4aba192942ff918238ef43..ffda15318be595ec82128b434cb114a700bf187f 100644 (file)
@@ -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;