aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashika Kheria <rashika.kheria@gmail.com>2014-02-09 11:59:14 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-09 20:32:50 -0500
commit535d3ae9c808e6a5248f0524dbc7a9e997cf3288 (patch)
tree5d51203908e474c06ce99ee0bb7612896e0c2354
parent7780d8ae4ae1960ef7c0570de0a1ecd7b60c8152 (diff)
net: Move prototype declaration to header file include/net/net_namespace.h from net/ipx/af_ipx.c
Move prototype declaration of function to header file include/net/net_namespace.h from net/ipx/af_ipx.c because they are used by more than one file. This eliminates the following warning in net/ipx/sysctl_net_ipx.c: net/ipx/sysctl_net_ipx.c:33:6: warning: no previous prototype for ‘ipx_register_sysctl’ [-Wmissing-prototypes] net/ipx/sysctl_net_ipx.c:38:6: warning: no previous prototype for ‘ipx_unregister_sysctl’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/net_namespace.h8
-rw-r--r--net/ipx/af_ipx.c9
2 files changed, 9 insertions, 8 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index da68c9a90ac5..991dcd94cbbf 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -162,6 +162,14 @@ extern struct list_head net_namespace_list;
162struct net *get_net_ns_by_pid(pid_t pid); 162struct net *get_net_ns_by_pid(pid_t pid);
163struct net *get_net_ns_by_fd(int pid); 163struct net *get_net_ns_by_fd(int pid);
164 164
165#ifdef CONFIG_SYSCTL
166void ipx_register_sysctl(void);
167void ipx_unregister_sysctl(void);
168#else
169#define ipx_register_sysctl()
170#define ipx_unregister_sysctl()
171#endif
172
165#ifdef CONFIG_NET_NS 173#ifdef CONFIG_NET_NS
166void __put_net(struct net *net); 174void __put_net(struct net *net);
167 175
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 224d05856b85..00b2a6d1c009 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -54,17 +54,10 @@
54#include <net/sock.h> 54#include <net/sock.h>
55#include <net/datalink.h> 55#include <net/datalink.h>
56#include <net/tcp_states.h> 56#include <net/tcp_states.h>
57#include <net/net_namespace.h>
57 58
58#include <asm/uaccess.h> 59#include <asm/uaccess.h>
59 60
60#ifdef CONFIG_SYSCTL
61extern void ipx_register_sysctl(void);
62extern void ipx_unregister_sysctl(void);
63#else
64#define ipx_register_sysctl()
65#define ipx_unregister_sysctl()
66#endif
67
68/* Configuration Variables */ 61/* Configuration Variables */
69static unsigned char ipxcfg_max_hops = 16; 62static unsigned char ipxcfg_max_hops = 16;
70static char ipxcfg_auto_select_primary; 63static char ipxcfg_auto_select_primary;