summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2024-08-04 00:38:45 +0300
committerDavid S. Miller <davem@davemloft.net>2024-08-04 00:38:45 +0300
commit83044bf90e081ffe87ae3521914b46bfdaba3b1d (patch)
tree162d353104a07121ee14a133fd6ee0c9f38f1f92 /include
parentc4b28e5699d2a789fc9464e7ce89f2a1e9d5085d (diff)
parent8eaf71f77c923f13e41a146703b93fa7988d101f (diff)
downloadlinux-83044bf90e081ffe87ae3521914b46bfdaba3b1d.tar.xz
Merge branch 'netns-init-cleanups' into main
Kuniyuki Iwashima says: ==================== net: Random cleanup for netns initialisation. patch 1 & 2 suppress unwanted memory allocation for net->gen->ptr[]. patch 3 ~ 6 move part of netns initialisation to prenet_init() that do not require pernet_ops_rwsem. v2: patch 1 : Removed Fixes: tag patch 2 : Use XOR for WARN_ON() v1: https://lore.kernel.org/netdev/20240729210801.16196-1-kuniyu@amazon.com/ ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/net_namespace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 20c34bd7a077..e67b483cc8bb 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -451,8 +451,8 @@ struct pernet_operations {
/* Following method is called with RTNL held. */
void (*exit_batch_rtnl)(struct list_head *net_exit_list,
struct list_head *dev_kill_list);
- unsigned int *id;
- size_t size;
+ unsigned int * const id;
+ const size_t size;
};
/*