Commit f99189b186f3922ede4fa33c02f6edc735b8c981

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 615534bc49

netns: net_identifiers should be read_mostly

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 13 changed files with 13 additions and 13 deletions Side-by-side Diff

drivers/net/bonding/bond_main.c
... ... @@ -158,7 +158,7 @@
158 158 static const char * const version =
159 159 DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
160 160  
161   -int bond_net_id;
  161 +int bond_net_id __read_mostly;
162 162  
163 163 static __be32 arp_target[BOND_MAX_ARP_TARGETS];
164 164 static int arp_ip_count;
drivers/net/ppp_generic.c
... ... @@ -184,7 +184,7 @@
184 184 static atomic_t channel_count = ATOMIC_INIT(0);
185 185  
186 186 /* per-net private data for this module */
187   -static int ppp_net_id;
  187 +static int ppp_net_id __read_mostly;
188 188 struct ppp_net {
189 189 /* units to ppp mapping */
190 190 struct idr units_idr;
... ... @@ -97,7 +97,7 @@
97 97 static struct ppp_channel_ops pppoe_chan_ops;
98 98  
99 99 /* per-net private data for this module */
100   -static int pppoe_net_id;
  100 +static int pppoe_net_id __read_mostly;
101 101 struct pppoe_net {
102 102 /*
103 103 * we could use _single_ hash table for all
drivers/net/pppol2tp.c
... ... @@ -232,7 +232,7 @@
232 232 static const struct proto_ops pppol2tp_ops;
233 233  
234 234 /* per-net private data for this module */
235   -static int pppol2tp_net_id;
  235 +static int pppol2tp_net_id __read_mostly;
236 236 struct pppol2tp_net {
237 237 struct list_head pppol2tp_tunnel_list;
238 238 rwlock_t pppol2tp_tunnel_list_lock;
... ... @@ -41,7 +41,7 @@
41 41  
42 42 /* Global VLAN variables */
43 43  
44   -int vlan_net_id;
  44 +int vlan_net_id __read_mostly;
45 45  
46 46 /* Our listing of VLAN group(s) */
47 47 static struct hlist_head vlan_group_hash[VLAN_GRP_HASH_SIZE];
... ... @@ -125,7 +125,7 @@
125 125  
126 126 #define HASH_SIZE 16
127 127  
128   -static int ipgre_net_id;
  128 +static int ipgre_net_id __read_mostly;
129 129 struct ipgre_net {
130 130 struct ip_tunnel *tunnels[4][HASH_SIZE];
131 131  
... ... @@ -119,7 +119,7 @@
119 119 #define HASH_SIZE 16
120 120 #define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&0xF)
121 121  
122   -static int ipip_net_id;
  122 +static int ipip_net_id __read_mostly;
123 123 struct ipip_net {
124 124 struct ip_tunnel *tunnels_r_l[HASH_SIZE];
125 125 struct ip_tunnel *tunnels_r[HASH_SIZE];
net/ipv6/ip6_tunnel.c
... ... @@ -78,7 +78,7 @@
78 78 static void ip6_tnl_dev_init(struct net_device *dev);
79 79 static void ip6_tnl_dev_setup(struct net_device *dev);
80 80  
81   -static int ip6_tnl_net_id;
  81 +static int ip6_tnl_net_id __read_mostly;
82 82 struct ip6_tnl_net {
83 83 /* the IPv6 tunnel fallback device */
84 84 struct net_device *fb_tnl_dev;
... ... @@ -66,7 +66,7 @@
66 66 static void ipip6_tunnel_init(struct net_device *dev);
67 67 static void ipip6_tunnel_setup(struct net_device *dev);
68 68  
69   -static int sit_net_id;
  69 +static int sit_net_id __read_mostly;
70 70 struct sit_net {
71 71 struct ip_tunnel *tunnels_r_l[HASH_SIZE];
72 72 struct ip_tunnel *tunnels_r[HASH_SIZE];
... ... @@ -35,7 +35,7 @@
35 35 #define _X2KEY(x) ((x) == XFRM_INF ? 0 : (x))
36 36 #define _KEY2X(x) ((x) == 0 ? XFRM_INF : (x))
37 37  
38   -static int pfkey_net_id;
  38 +static int pfkey_net_id __read_mostly;
39 39 struct netns_pfkey {
40 40 /* List of all pfkey sockets. */
41 41 struct hlist_head table;
net/netfilter/nf_conntrack_proto_dccp.c
... ... @@ -384,7 +384,7 @@
384 384 };
385 385  
386 386 /* this module per-net specifics */
387   -static int dccp_net_id;
  387 +static int dccp_net_id __read_mostly;
388 388 struct dccp_net {
389 389 int dccp_loose;
390 390 unsigned int dccp_timeout[CT_DCCP_MAX + 1];
net/netfilter/nf_conntrack_proto_gre.c
... ... @@ -43,7 +43,7 @@
43 43 #define GRE_TIMEOUT (30 * HZ)
44 44 #define GRE_STREAM_TIMEOUT (180 * HZ)
45 45  
46   -static int proto_gre_net_id;
  46 +static int proto_gre_net_id __read_mostly;
47 47 struct netns_proto_gre {
48 48 rwlock_t keymap_lock;
49 49 struct list_head keymap_list;
... ... @@ -43,7 +43,7 @@
43 43 struct phonet_routes routes;
44 44 };
45 45  
46   -int phonet_net_id;
  46 +int phonet_net_id __read_mostly;
47 47  
48 48 struct phonet_device_list *phonet_device_list(struct net *net)
49 49 {