diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/netns/sctp.h | 5 | ||||
-rw-r--r-- | include/net/sctp/sctp.h | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h index 29e36b4b4feb..9c20a82a77ec 100644 --- a/include/net/netns/sctp.h +++ b/include/net/netns/sctp.h | |||
@@ -2,8 +2,13 @@ | |||
2 | #define __NETNS_SCTP_H__ | 2 | #define __NETNS_SCTP_H__ |
3 | 3 | ||
4 | struct sock; | 4 | struct sock; |
5 | struct proc_dir_entry; | ||
5 | 6 | ||
6 | struct netns_sctp { | 7 | struct netns_sctp { |
8 | #ifdef CONFIG_PROC_FS | ||
9 | struct proc_dir_entry *proc_net_sctp; | ||
10 | #endif | ||
11 | |||
7 | /* This is the global socket data structure used for responding to | 12 | /* This is the global socket data structure used for responding to |
8 | * the Out-of-the-blue (OOTB) packets. A control sock will be created | 13 | * the Out-of-the-blue (OOTB) packets. A control sock will be created |
9 | * for this socket at the initialization time. | 14 | * for this socket at the initialization time. |
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 550a81bbfc71..b49588a51d80 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -172,14 +172,14 @@ void sctp_backlog_migrate(struct sctp_association *assoc, | |||
172 | /* | 172 | /* |
173 | * sctp/proc.c | 173 | * sctp/proc.c |
174 | */ | 174 | */ |
175 | int sctp_snmp_proc_init(void); | 175 | int sctp_snmp_proc_init(struct net *net); |
176 | void sctp_snmp_proc_exit(void); | 176 | void sctp_snmp_proc_exit(struct net *net); |
177 | int sctp_eps_proc_init(void); | 177 | int sctp_eps_proc_init(struct net *net); |
178 | void sctp_eps_proc_exit(void); | 178 | void sctp_eps_proc_exit(struct net *net); |
179 | int sctp_assocs_proc_init(void); | 179 | int sctp_assocs_proc_init(struct net *net); |
180 | void sctp_assocs_proc_exit(void); | 180 | void sctp_assocs_proc_exit(struct net *net); |
181 | int sctp_remaddr_proc_init(void); | 181 | int sctp_remaddr_proc_init(struct net *net); |
182 | void sctp_remaddr_proc_exit(void); | 182 | void sctp_remaddr_proc_exit(struct net *net); |
183 | 183 | ||
184 | 184 | ||
185 | /* | 185 | /* |
@@ -360,16 +360,16 @@ atomic_t sctp_dbg_objcnt_## name = ATOMIC_INIT(0) | |||
360 | #define SCTP_DBG_OBJCNT_ENTRY(name) \ | 360 | #define SCTP_DBG_OBJCNT_ENTRY(name) \ |
361 | {.label= #name, .counter= &sctp_dbg_objcnt_## name} | 361 | {.label= #name, .counter= &sctp_dbg_objcnt_## name} |
362 | 362 | ||
363 | void sctp_dbg_objcnt_init(void); | 363 | void sctp_dbg_objcnt_init(struct net *); |
364 | void sctp_dbg_objcnt_exit(void); | 364 | void sctp_dbg_objcnt_exit(struct net *); |
365 | 365 | ||
366 | #else | 366 | #else |
367 | 367 | ||
368 | #define SCTP_DBG_OBJCNT_INC(name) | 368 | #define SCTP_DBG_OBJCNT_INC(name) |
369 | #define SCTP_DBG_OBJCNT_DEC(name) | 369 | #define SCTP_DBG_OBJCNT_DEC(name) |
370 | 370 | ||
371 | static inline void sctp_dbg_objcnt_init(void) { return; } | 371 | static inline void sctp_dbg_objcnt_init(struct net *) { return; } |
372 | static inline void sctp_dbg_objcnt_exit(void) { return; } | 372 | static inline void sctp_dbg_objcnt_exit(struct net *) { return; } |
373 | 373 | ||
374 | #endif /* CONFIG_SCTP_DBG_OBJCOUNT */ | 374 | #endif /* CONFIG_SCTP_DBG_OBJCOUNT */ |
375 | 375 | ||
@@ -585,7 +585,6 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\ | |||
585 | 585 | ||
586 | extern struct proto sctp_prot; | 586 | extern struct proto sctp_prot; |
587 | extern struct proto sctpv6_prot; | 587 | extern struct proto sctpv6_prot; |
588 | extern struct proc_dir_entry *proc_net_sctp; | ||
589 | void sctp_put_port(struct sock *sk); | 588 | void sctp_put_port(struct sock *sk); |
590 | 589 | ||
591 | extern struct idr sctp_assocs_id; | 590 | extern struct idr sctp_assocs_id; |