aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/x25.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-23 14:33:49 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-23 16:29:41 -0400
commit5db50ee6e617c347a24b18ee229e44ba8d4d84a3 (patch)
treeb7fd9047a0847c8aeba203f6506a7067628aeb2e /include/net/x25.h
parent6dfd43d28c92a6d00a3bbccb2aa978de8c1c96b8 (diff)
x25.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>
Diffstat (limited to 'include/net/x25.h')
-rw-r--r--include/net/x25.h141
1 files changed, 71 insertions, 70 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index b4a8a8923128..c383aa4edbf0 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -187,57 +187,57 @@ extern int sysctl_x25_clear_request_timeout;
187extern int sysctl_x25_ack_holdback_timeout; 187extern int sysctl_x25_ack_holdback_timeout;
188extern int sysctl_x25_forward; 188extern int sysctl_x25_forward;
189 189
190extern int x25_parse_address_block(struct sk_buff *skb, 190int x25_parse_address_block(struct sk_buff *skb,
191 struct x25_address *called_addr, 191 struct x25_address *called_addr,
192 struct x25_address *calling_addr); 192 struct x25_address *calling_addr);
193 193
194extern int x25_addr_ntoa(unsigned char *, struct x25_address *, 194int x25_addr_ntoa(unsigned char *, struct x25_address *, struct x25_address *);
195 struct x25_address *); 195int x25_addr_aton(unsigned char *, struct x25_address *, struct x25_address *);
196extern int x25_addr_aton(unsigned char *, struct x25_address *, 196struct sock *x25_find_socket(unsigned int, struct x25_neigh *);
197 struct x25_address *); 197void x25_destroy_socket_from_timer(struct sock *);
198extern struct sock *x25_find_socket(unsigned int, struct x25_neigh *); 198int x25_rx_call_request(struct sk_buff *, struct x25_neigh *, unsigned int);
199extern void x25_destroy_socket_from_timer(struct sock *); 199void x25_kill_by_neigh(struct x25_neigh *);
200extern int x25_rx_call_request(struct sk_buff *, struct x25_neigh *, unsigned int);
201extern void x25_kill_by_neigh(struct x25_neigh *);
202 200
203/* x25_dev.c */ 201/* x25_dev.c */
204extern void x25_send_frame(struct sk_buff *, struct x25_neigh *); 202void x25_send_frame(struct sk_buff *, struct x25_neigh *);
205extern int x25_lapb_receive_frame(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *); 203int x25_lapb_receive_frame(struct sk_buff *, struct net_device *,
206extern void x25_establish_link(struct x25_neigh *); 204 struct packet_type *, struct net_device *);
207extern void x25_terminate_link(struct x25_neigh *); 205void x25_establish_link(struct x25_neigh *);
206void x25_terminate_link(struct x25_neigh *);
208 207
209/* x25_facilities.c */ 208/* x25_facilities.c */
210extern int x25_parse_facilities(struct sk_buff *, struct x25_facilities *, 209int x25_parse_facilities(struct sk_buff *, struct x25_facilities *,
211 struct x25_dte_facilities *, unsigned long *); 210 struct x25_dte_facilities *, unsigned long *);
212extern int x25_create_facilities(unsigned char *, struct x25_facilities *, 211int x25_create_facilities(unsigned char *, struct x25_facilities *,
213 struct x25_dte_facilities *, unsigned long); 212 struct x25_dte_facilities *, unsigned long);
214extern int x25_negotiate_facilities(struct sk_buff *, struct sock *, 213int x25_negotiate_facilities(struct sk_buff *, struct sock *,
215 struct x25_facilities *, 214 struct x25_facilities *,
216 struct x25_dte_facilities *); 215 struct x25_dte_facilities *);
217extern void x25_limit_facilities(struct x25_facilities *, struct x25_neigh *); 216void x25_limit_facilities(struct x25_facilities *, struct x25_neigh *);
218 217
219/* x25_forward.c */ 218/* x25_forward.c */
220extern void x25_clear_forward_by_lci(unsigned int lci); 219void x25_clear_forward_by_lci(unsigned int lci);
221extern void x25_clear_forward_by_dev(struct net_device *); 220void x25_clear_forward_by_dev(struct net_device *);
222extern int x25_forward_data(int, struct x25_neigh *, struct sk_buff *); 221int x25_forward_data(int, struct x25_neigh *, struct sk_buff *);
223extern int x25_forward_call(struct x25_address *, struct x25_neigh *, 222int x25_forward_call(struct x25_address *, struct x25_neigh *, struct sk_buff *,
224 struct sk_buff *, int); 223 int);
225 224
226/* x25_in.c */ 225/* x25_in.c */
227extern int x25_process_rx_frame(struct sock *, struct sk_buff *); 226int x25_process_rx_frame(struct sock *, struct sk_buff *);
228extern int x25_backlog_rcv(struct sock *, struct sk_buff *); 227int x25_backlog_rcv(struct sock *, struct sk_buff *);
229 228
230/* x25_link.c */ 229/* x25_link.c */
231extern void x25_link_control(struct sk_buff *, struct x25_neigh *, unsigned short); 230void x25_link_control(struct sk_buff *, struct x25_neigh *, unsigned short);
232extern void x25_link_device_up(struct net_device *); 231void x25_link_device_up(struct net_device *);
233extern void x25_link_device_down(struct net_device *); 232void x25_link_device_down(struct net_device *);
234extern void x25_link_established(struct x25_neigh *); 233void x25_link_established(struct x25_neigh *);
235extern void x25_link_terminated(struct x25_neigh *); 234void x25_link_terminated(struct x25_neigh *);
236extern void x25_transmit_clear_request(struct x25_neigh *, unsigned int, unsigned char); 235void x25_transmit_clear_request(struct x25_neigh *, unsigned int,
237extern void x25_transmit_link(struct sk_buff *, struct x25_neigh *); 236 unsigned char);
238extern int x25_subscr_ioctl(unsigned int, void __user *); 237void x25_transmit_link(struct sk_buff *, struct x25_neigh *);
239extern struct x25_neigh *x25_get_neigh(struct net_device *); 238int x25_subscr_ioctl(unsigned int, void __user *);
240extern void x25_link_free(void); 239struct x25_neigh *x25_get_neigh(struct net_device *);
240void x25_link_free(void);
241 241
242/* x25_neigh.c */ 242/* x25_neigh.c */
243static __inline__ void x25_neigh_hold(struct x25_neigh *nb) 243static __inline__ void x25_neigh_hold(struct x25_neigh *nb)
@@ -252,16 +252,16 @@ static __inline__ void x25_neigh_put(struct x25_neigh *nb)
252} 252}
253 253
254/* x25_out.c */ 254/* x25_out.c */
255extern int x25_output(struct sock *, struct sk_buff *); 255int x25_output(struct sock *, struct sk_buff *);
256extern void x25_kick(struct sock *); 256void x25_kick(struct sock *);
257extern void x25_enquiry_response(struct sock *); 257void x25_enquiry_response(struct sock *);
258 258
259/* x25_route.c */ 259/* x25_route.c */
260extern struct x25_route *x25_get_route(struct x25_address *addr); 260struct x25_route *x25_get_route(struct x25_address *addr);
261extern struct net_device *x25_dev_get(char *); 261struct net_device *x25_dev_get(char *);
262extern void x25_route_device_down(struct net_device *dev); 262void x25_route_device_down(struct net_device *dev);
263extern int x25_route_ioctl(unsigned int, void __user *); 263int x25_route_ioctl(unsigned int, void __user *);
264extern void x25_route_free(void); 264void x25_route_free(void);
265 265
266static __inline__ void x25_route_hold(struct x25_route *rt) 266static __inline__ void x25_route_hold(struct x25_route *rt)
267{ 267{
@@ -275,30 +275,31 @@ static __inline__ void x25_route_put(struct x25_route *rt)
275} 275}
276 276
277/* x25_subr.c */ 277/* x25_subr.c */
278extern void x25_clear_queues(struct sock *); 278void x25_clear_queues(struct sock *);
279extern void x25_frames_acked(struct sock *, unsigned short); 279void x25_frames_acked(struct sock *, unsigned short);
280extern void x25_requeue_frames(struct sock *); 280void x25_requeue_frames(struct sock *);
281extern int x25_validate_nr(struct sock *, unsigned short); 281int x25_validate_nr(struct sock *, unsigned short);
282extern void x25_write_internal(struct sock *, int); 282void x25_write_internal(struct sock *, int);
283extern int x25_decode(struct sock *, struct sk_buff *, int *, int *, int *, int *, int *); 283int x25_decode(struct sock *, struct sk_buff *, int *, int *, int *, int *,
284extern void x25_disconnect(struct sock *, int, unsigned char, unsigned char); 284 int *);
285void x25_disconnect(struct sock *, int, unsigned char, unsigned char);
285 286
286/* x25_timer.c */ 287/* x25_timer.c */
287extern void x25_init_timers(struct sock *sk); 288void x25_init_timers(struct sock *sk);
288extern void x25_start_heartbeat(struct sock *); 289void x25_start_heartbeat(struct sock *);
289extern void x25_start_t2timer(struct sock *); 290void x25_start_t2timer(struct sock *);
290extern void x25_start_t21timer(struct sock *); 291void x25_start_t21timer(struct sock *);
291extern void x25_start_t22timer(struct sock *); 292void x25_start_t22timer(struct sock *);
292extern void x25_start_t23timer(struct sock *); 293void x25_start_t23timer(struct sock *);
293extern void x25_stop_heartbeat(struct sock *); 294void x25_stop_heartbeat(struct sock *);
294extern void x25_stop_timer(struct sock *); 295void x25_stop_timer(struct sock *);
295extern unsigned long x25_display_timer(struct sock *); 296unsigned long x25_display_timer(struct sock *);
296extern void x25_check_rbuf(struct sock *); 297void x25_check_rbuf(struct sock *);
297 298
298/* sysctl_net_x25.c */ 299/* sysctl_net_x25.c */
299#ifdef CONFIG_SYSCTL 300#ifdef CONFIG_SYSCTL
300extern void x25_register_sysctl(void); 301void x25_register_sysctl(void);
301extern void x25_unregister_sysctl(void); 302void x25_unregister_sysctl(void);
302#else 303#else
303static inline void x25_register_sysctl(void) {}; 304static inline void x25_register_sysctl(void) {};
304static inline void x25_unregister_sysctl(void) {}; 305static inline void x25_unregister_sysctl(void) {};
@@ -318,6 +319,6 @@ extern rwlock_t x25_forward_list_lock;
318extern struct list_head x25_neigh_list; 319extern struct list_head x25_neigh_list;
319extern rwlock_t x25_neigh_list_lock; 320extern rwlock_t x25_neigh_list_lock;
320 321
321extern int x25_proc_init(void); 322int x25_proc_init(void);
322extern void x25_proc_exit(void); 323void x25_proc_exit(void);
323#endif 324#endif