diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 09:45:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-20 21:22:30 -0400 |
commit | a5347fe36b313c07d59b065d00a8fa56362c5f97 (patch) | |
tree | 8778711b514baca6f5686777c0dea245a8874711 /include | |
parent | ec8f23ce0f4005b74013d4d122e0d540397a93c9 (diff) |
net: Delete all remaining instances of ctl_path
We don't use struct ctl_path anymore so delete the exported constants.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter.h | 6 | ||||
-rw-r--r-- | include/net/ip.h | 3 | ||||
-rw-r--r-- | include/net/ip_vs.h | 2 | ||||
-rw-r--r-- | include/net/ipv6.h | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 29734be334c1..ff9c84c29b28 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
@@ -154,12 +154,6 @@ void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n); | |||
154 | int nf_register_sockopt(struct nf_sockopt_ops *reg); | 154 | int nf_register_sockopt(struct nf_sockopt_ops *reg); |
155 | void nf_unregister_sockopt(struct nf_sockopt_ops *reg); | 155 | void nf_unregister_sockopt(struct nf_sockopt_ops *reg); |
156 | 156 | ||
157 | #ifdef CONFIG_SYSCTL | ||
158 | /* Sysctl registration */ | ||
159 | extern struct ctl_path nf_net_netfilter_sysctl_path[]; | ||
160 | extern struct ctl_path nf_net_ipv4_netfilter_sysctl_path[]; | ||
161 | #endif /* CONFIG_SYSCTL */ | ||
162 | |||
163 | extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; | 157 | extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; |
164 | 158 | ||
165 | #if defined(CONFIG_JUMP_LABEL) | 159 | #if defined(CONFIG_JUMP_LABEL) |
diff --git a/include/net/ip.h b/include/net/ip.h index b53d65f24f7b..94ddb69cc0f3 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -222,9 +222,6 @@ static inline int inet_is_reserved_local_port(int port) | |||
222 | 222 | ||
223 | extern int sysctl_ip_nonlocal_bind; | 223 | extern int sysctl_ip_nonlocal_bind; |
224 | 224 | ||
225 | extern struct ctl_path net_core_path[]; | ||
226 | extern struct ctl_path net_ipv4_ctl_path[]; | ||
227 | |||
228 | /* From inetpeer.c */ | 225 | /* From inetpeer.c */ |
229 | extern int inet_peer_threshold; | 226 | extern int inet_peer_threshold; |
230 | extern int inet_peer_minttl; | 227 | extern int inet_peer_minttl; |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index a903a828bcef..990216ded6b3 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -10,7 +10,6 @@ | |||
10 | 10 | ||
11 | #include <asm/types.h> /* for __uXX types */ | 11 | #include <asm/types.h> /* for __uXX types */ |
12 | 12 | ||
13 | #include <linux/sysctl.h> /* for ctl_path */ | ||
14 | #include <linux/list.h> /* for struct list_head */ | 13 | #include <linux/list.h> /* for struct list_head */ |
15 | #include <linux/spinlock.h> /* for struct rwlock_t */ | 14 | #include <linux/spinlock.h> /* for struct rwlock_t */ |
16 | #include <linux/atomic.h> /* for struct atomic_t */ | 15 | #include <linux/atomic.h> /* for struct atomic_t */ |
@@ -1184,7 +1183,6 @@ extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg); | |||
1184 | * IPVS control data and functions (from ip_vs_ctl.c) | 1183 | * IPVS control data and functions (from ip_vs_ctl.c) |
1185 | */ | 1184 | */ |
1186 | extern struct ip_vs_stats ip_vs_stats; | 1185 | extern struct ip_vs_stats ip_vs_stats; |
1187 | extern const struct ctl_path net_vs_ctl_path[]; | ||
1188 | extern int sysctl_ip_vs_sync_ver; | 1186 | extern int sysctl_ip_vs_sync_ver; |
1189 | 1187 | ||
1190 | extern void ip_vs_sync_switch_mode(struct net *net, int mode); | 1188 | extern void ip_vs_sync_switch_mode(struct net *net, int mode); |
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index e1a85adbeee3..4332e9aad853 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -113,7 +113,6 @@ struct frag_hdr { | |||
113 | 113 | ||
114 | /* sysctls */ | 114 | /* sysctls */ |
115 | extern int sysctl_mld_max_msf; | 115 | extern int sysctl_mld_max_msf; |
116 | extern struct ctl_path net_ipv6_ctl_path[]; | ||
117 | 116 | ||
118 | #define _DEVINC(net, statname, modifier, idev, field) \ | 117 | #define _DEVINC(net, statname, modifier, idev, field) \ |
119 | ({ \ | 118 | ({ \ |