summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-20 14:23:20 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-20 14:49:32 -0400
commit59ddd965c2388720681eb4dc386bfb074e80788e (patch)
tree82129a47ef40cbaea0d7e004ef17ba672d4c671d
parent126c623b3980e7c2dd68777171f5b6b6ab352912 (diff)
decnet (dn*.h): Remove extern from function prototypes
There are a mix of function prototypes with and without extern in the kernel sources. Standardize on not using extern for function prototypes. Function prototypes don't need to be written with extern. extern is assumed by the compiler. Its use is as unnecessary as using auto to declare automatic/local variables in a block. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/dn.h20
-rw-r--r--include/net/dn_dev.h30
-rw-r--r--include/net/dn_fib.h47
-rw-r--r--include/net/dn_neigh.h12
-rw-r--r--include/net/dn_nsp.h49
-rw-r--r--include/net/dn_route.h13
6 files changed, 87 insertions, 84 deletions
diff --git a/include/net/dn.h b/include/net/dn.h
index c88bf4ebd330..ccc15588d108 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -199,24 +199,26 @@ static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
199 fld->fld_dport = scp->addrrem; 199 fld->fld_dport = scp->addrrem;
200} 200}
201 201
202extern unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu); 202unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu);
203 203
204#define DN_MENUVER_ACC 0x01 204#define DN_MENUVER_ACC 0x01
205#define DN_MENUVER_USR 0x02 205#define DN_MENUVER_USR 0x02
206#define DN_MENUVER_PRX 0x04 206#define DN_MENUVER_PRX 0x04
207#define DN_MENUVER_UIC 0x08 207#define DN_MENUVER_UIC 0x08
208 208
209extern struct sock *dn_sklist_find_listener(struct sockaddr_dn *addr); 209struct sock *dn_sklist_find_listener(struct sockaddr_dn *addr);
210extern struct sock *dn_find_by_skb(struct sk_buff *skb); 210struct sock *dn_find_by_skb(struct sk_buff *skb);
211#define DN_ASCBUF_LEN 9 211#define DN_ASCBUF_LEN 9
212extern char *dn_addr2asc(__u16, char *); 212char *dn_addr2asc(__u16, char *);
213extern int dn_destroy_timer(struct sock *sk); 213int dn_destroy_timer(struct sock *sk);
214 214
215extern int dn_sockaddr2username(struct sockaddr_dn *addr, unsigned char *buf, unsigned char type); 215int dn_sockaddr2username(struct sockaddr_dn *addr, unsigned char *buf,
216extern int dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn *addr, unsigned char *type); 216 unsigned char type);
217int dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn *addr,
218 unsigned char *type);
217 219
218extern void dn_start_slow_timer(struct sock *sk); 220void dn_start_slow_timer(struct sock *sk);
219extern void dn_stop_slow_timer(struct sock *sk); 221void dn_stop_slow_timer(struct sock *sk);
220 222
221extern __le16 decnet_address; 223extern __le16 decnet_address;
222extern int decnet_debug_level; 224extern int decnet_debug_level;
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index b9e32db03f20..20b5ab06032d 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -148,27 +148,27 @@ struct rtnode_hello_message {
148} __packed; 148} __packed;
149 149
150 150
151extern void dn_dev_init(void); 151void dn_dev_init(void);
152extern void dn_dev_cleanup(void); 152void dn_dev_cleanup(void);
153 153
154extern int dn_dev_ioctl(unsigned int cmd, void __user *arg); 154int dn_dev_ioctl(unsigned int cmd, void __user *arg);
155 155
156extern void dn_dev_devices_off(void); 156void dn_dev_devices_off(void);
157extern void dn_dev_devices_on(void); 157void dn_dev_devices_on(void);
158 158
159extern void dn_dev_init_pkt(struct sk_buff *skb); 159void dn_dev_init_pkt(struct sk_buff *skb);
160extern void dn_dev_veri_pkt(struct sk_buff *skb); 160void dn_dev_veri_pkt(struct sk_buff *skb);
161extern void dn_dev_hello(struct sk_buff *skb); 161void dn_dev_hello(struct sk_buff *skb);
162 162
163extern void dn_dev_up(struct net_device *); 163void dn_dev_up(struct net_device *);
164extern void dn_dev_down(struct net_device *); 164void dn_dev_down(struct net_device *);
165 165
166extern int dn_dev_set_default(struct net_device *dev, int force); 166int dn_dev_set_default(struct net_device *dev, int force);
167extern struct net_device *dn_dev_get_default(void); 167struct net_device *dn_dev_get_default(void);
168extern int dn_dev_bind_default(__le16 *addr); 168int dn_dev_bind_default(__le16 *addr);
169 169
170extern int register_dnaddr_notifier(struct notifier_block *nb); 170int register_dnaddr_notifier(struct notifier_block *nb);
171extern int unregister_dnaddr_notifier(struct notifier_block *nb); 171int unregister_dnaddr_notifier(struct notifier_block *nb);
172 172
173static inline int dn_dev_islocal(struct net_device *dev, __le16 addr) 173static inline int dn_dev_islocal(struct net_device *dev, __le16 addr)
174{ 174{
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index 74004af31c48..f2ca135ddcc9 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -95,41 +95,38 @@ struct dn_fib_table {
95/* 95/*
96 * dn_fib.c 96 * dn_fib.c
97 */ 97 */
98extern void dn_fib_init(void); 98void dn_fib_init(void);
99extern void dn_fib_cleanup(void); 99void dn_fib_cleanup(void);
100 100
101extern int dn_fib_ioctl(struct socket *sock, unsigned int cmd, 101int dn_fib_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
102 unsigned long arg); 102struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r,
103extern struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, 103 struct nlattr *attrs[],
104 struct nlattr *attrs[], 104 const struct nlmsghdr *nlh, int *errp);
105 const struct nlmsghdr *nlh, int *errp); 105int dn_fib_semantic_match(int type, struct dn_fib_info *fi,
106extern int dn_fib_semantic_match(int type, struct dn_fib_info *fi, 106 const struct flowidn *fld, struct dn_fib_res *res);
107 const struct flowidn *fld, 107void dn_fib_release_info(struct dn_fib_info *fi);
108 struct dn_fib_res *res); 108void dn_fib_flush(void);
109extern void dn_fib_release_info(struct dn_fib_info *fi); 109void dn_fib_select_multipath(const struct flowidn *fld, struct dn_fib_res *res);
110extern void dn_fib_flush(void);
111extern void dn_fib_select_multipath(const struct flowidn *fld,
112 struct dn_fib_res *res);
113 110
114/* 111/*
115 * dn_tables.c 112 * dn_tables.c
116 */ 113 */
117extern struct dn_fib_table *dn_fib_get_table(u32 n, int creat); 114struct dn_fib_table *dn_fib_get_table(u32 n, int creat);
118extern struct dn_fib_table *dn_fib_empty_table(void); 115struct dn_fib_table *dn_fib_empty_table(void);
119extern void dn_fib_table_init(void); 116void dn_fib_table_init(void);
120extern void dn_fib_table_cleanup(void); 117void dn_fib_table_cleanup(void);
121 118
122/* 119/*
123 * dn_rules.c 120 * dn_rules.c
124 */ 121 */
125extern void dn_fib_rules_init(void); 122void dn_fib_rules_init(void);
126extern void dn_fib_rules_cleanup(void); 123void dn_fib_rules_cleanup(void);
127extern unsigned int dnet_addr_type(__le16 addr); 124unsigned int dnet_addr_type(__le16 addr);
128extern int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res); 125int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res);
129 126
130extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb); 127int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
131 128
132extern void dn_fib_free_info(struct dn_fib_info *fi); 129void dn_fib_free_info(struct dn_fib_info *fi);
133 130
134static inline void dn_fib_info_put(struct dn_fib_info *fi) 131static inline void dn_fib_info_put(struct dn_fib_info *fi)
135{ 132{
diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h
index 4cb4ae7fb81f..fac4e3f4a6d3 100644
--- a/include/net/dn_neigh.h
+++ b/include/net/dn_neigh.h
@@ -16,12 +16,12 @@ struct dn_neigh {
16 __u8 priority; 16 __u8 priority;
17}; 17};
18 18
19extern void dn_neigh_init(void); 19void dn_neigh_init(void);
20extern void dn_neigh_cleanup(void); 20void dn_neigh_cleanup(void);
21extern int dn_neigh_router_hello(struct sk_buff *skb); 21int dn_neigh_router_hello(struct sk_buff *skb);
22extern int dn_neigh_endnode_hello(struct sk_buff *skb); 22int dn_neigh_endnode_hello(struct sk_buff *skb);
23extern void dn_neigh_pointopoint_hello(struct sk_buff *skb); 23void dn_neigh_pointopoint_hello(struct sk_buff *skb);
24extern int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n); 24int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n);
25 25
26extern struct neigh_table dn_neigh_table; 26extern struct neigh_table dn_neigh_table;
27 27
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index e43a2893f132..3a3e33d18456 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -15,29 +15,32 @@
15*******************************************************************************/ 15*******************************************************************************/
16/* dn_nsp.c functions prototyping */ 16/* dn_nsp.c functions prototyping */
17 17
18extern void dn_nsp_send_data_ack(struct sock *sk); 18void dn_nsp_send_data_ack(struct sock *sk);
19extern void dn_nsp_send_oth_ack(struct sock *sk); 19void dn_nsp_send_oth_ack(struct sock *sk);
20extern void dn_nsp_delayed_ack(struct sock *sk); 20void dn_nsp_delayed_ack(struct sock *sk);
21extern void dn_send_conn_ack(struct sock *sk); 21void dn_send_conn_ack(struct sock *sk);
22extern void dn_send_conn_conf(struct sock *sk, gfp_t gfp); 22void dn_send_conn_conf(struct sock *sk, gfp_t gfp);
23extern void dn_nsp_send_disc(struct sock *sk, unsigned char type, 23void dn_nsp_send_disc(struct sock *sk, unsigned char type,
24 unsigned short reason, gfp_t gfp); 24 unsigned short reason, gfp_t gfp);
25extern void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type, 25void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type,
26 unsigned short reason); 26 unsigned short reason);
27extern void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval); 27void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval);
28extern void dn_nsp_send_conninit(struct sock *sk, unsigned char flags); 28void dn_nsp_send_conninit(struct sock *sk, unsigned char flags);
29 29
30extern void dn_nsp_output(struct sock *sk); 30void dn_nsp_output(struct sock *sk);
31extern int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff_head *q, unsigned short acknum); 31int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb,
32extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, gfp_t gfp, int oob); 32 struct sk_buff_head *q, unsigned short acknum);
33extern unsigned long dn_nsp_persist(struct sock *sk); 33void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, gfp_t gfp,
34extern int dn_nsp_xmit_timeout(struct sock *sk); 34 int oob);
35 35unsigned long dn_nsp_persist(struct sock *sk);
36extern int dn_nsp_rx(struct sk_buff *); 36int dn_nsp_xmit_timeout(struct sock *sk);
37extern int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb); 37
38 38int dn_nsp_rx(struct sk_buff *);
39extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri); 39int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
40extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, long timeo, int *err); 40
41struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
42struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock,
43 long timeo, int *err);
41 44
42#define NSP_REASON_OK 0 /* No error */ 45#define NSP_REASON_OK 0 /* No error */
43#define NSP_REASON_NR 1 /* No resources */ 46#define NSP_REASON_NR 1 /* No resources */
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 2e9d317c82dc..b409ad6b8d7a 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -15,10 +15,11 @@
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16*******************************************************************************/ 16*******************************************************************************/
17 17
18extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri); 18struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
19extern int dn_route_output_sock(struct dst_entry __rcu **pprt, struct flowidn *, struct sock *sk, int flags); 19int dn_route_output_sock(struct dst_entry __rcu **pprt, struct flowidn *,
20extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb); 20 struct sock *sk, int flags);
21extern void dn_rt_cache_flush(int delay); 21int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
22void dn_rt_cache_flush(int delay);
22 23
23/* Masks for flags field */ 24/* Masks for flags field */
24#define DN_RT_F_PID 0x07 /* Mask for packet type */ 25#define DN_RT_F_PID 0x07 /* Mask for packet type */
@@ -92,8 +93,8 @@ static inline bool dn_is_output_route(struct dn_route *rt)
92 return rt->fld.flowidn_iif == 0; 93 return rt->fld.flowidn_iif == 0;
93} 94}
94 95
95extern void dn_route_init(void); 96void dn_route_init(void);
96extern void dn_route_cleanup(void); 97void dn_route_cleanup(void);
97 98
98#include <net/sock.h> 99#include <net/sock.h>
99#include <linux/if_arp.h> 100#include <linux/if_arp.h>