Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 348662a1429f95ed2d488c939c324ec152638742

Authored by Joe Perches
Committed by David S. Miller
1 parent 47d27aad44
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

net: 8021q/bluetooth/bridge/can/ceph: 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>

Showing 8 changed files with 194 additions and 219 deletions Side-by-side Diff

... ... @@ -196,12 +196,12 @@
196 196 }
197 197  
198 198 #ifdef CONFIG_VLAN_8021Q_GVRP
199   -extern int vlan_gvrp_request_join(const struct net_device *dev);
200   -extern void vlan_gvrp_request_leave(const struct net_device *dev);
201   -extern int vlan_gvrp_init_applicant(struct net_device *dev);
202   -extern void vlan_gvrp_uninit_applicant(struct net_device *dev);
203   -extern int vlan_gvrp_init(void);
204   -extern void vlan_gvrp_uninit(void);
  199 +int vlan_gvrp_request_join(const struct net_device *dev);
  200 +void vlan_gvrp_request_leave(const struct net_device *dev);
  201 +int vlan_gvrp_init_applicant(struct net_device *dev);
  202 +void vlan_gvrp_uninit_applicant(struct net_device *dev);
  203 +int vlan_gvrp_init(void);
  204 +void vlan_gvrp_uninit(void);
205 205 #else
206 206 static inline int vlan_gvrp_request_join(const struct net_device *dev) { return 0; }
207 207 static inline void vlan_gvrp_request_leave(const struct net_device *dev) {}
... ... @@ -212,12 +212,12 @@
212 212 #endif
213 213  
214 214 #ifdef CONFIG_VLAN_8021Q_MVRP
215   -extern int vlan_mvrp_request_join(const struct net_device *dev);
216   -extern void vlan_mvrp_request_leave(const struct net_device *dev);
217   -extern int vlan_mvrp_init_applicant(struct net_device *dev);
218   -extern void vlan_mvrp_uninit_applicant(struct net_device *dev);
219   -extern int vlan_mvrp_init(void);
220   -extern void vlan_mvrp_uninit(void);
  215 +int vlan_mvrp_request_join(const struct net_device *dev);
  216 +void vlan_mvrp_request_leave(const struct net_device *dev);
  217 +int vlan_mvrp_init_applicant(struct net_device *dev);
  218 +void vlan_mvrp_uninit_applicant(struct net_device *dev);
  219 +int vlan_mvrp_init(void);
  220 +void vlan_mvrp_uninit(void);
221 221 #else
222 222 static inline int vlan_mvrp_request_join(const struct net_device *dev) { return 0; }
223 223 static inline void vlan_mvrp_request_leave(const struct net_device *dev) {}
... ... @@ -229,8 +229,8 @@
229 229  
230 230 extern const char vlan_fullname[];
231 231 extern const char vlan_version[];
232   -extern int vlan_netlink_init(void);
233   -extern void vlan_netlink_fini(void);
  232 +int vlan_netlink_init(void);
  233 +void vlan_netlink_fini(void);
234 234  
235 235 extern struct rtnl_link_ops vlan_link_ops;
236 236  
net/bluetooth/hidp/hidp.h
Diff comments   View file @ 348662a
... ... @@ -182,8 +182,8 @@
182 182 };
183 183  
184 184 /* HIDP init defines */
185   -extern int __init hidp_init_sockets(void);
186   -extern void __exit hidp_cleanup_sockets(void);
  185 +int __init hidp_init_sockets(void);
  186 +void __exit hidp_cleanup_sockets(void);
187 187  
188 188 #endif /* __HIDP_H */
net/bridge/br_private.h
Diff comments   View file @ 348662a
... ... @@ -344,10 +344,9 @@
344 344 }
345 345  
346 346 /* br_device.c */
347   -extern void br_dev_setup(struct net_device *dev);
348   -extern void br_dev_delete(struct net_device *dev, struct list_head *list);
349   -extern netdev_tx_t br_dev_xmit(struct sk_buff *skb,
350   - struct net_device *dev);
  347 +void br_dev_setup(struct net_device *dev);
  348 +void br_dev_delete(struct net_device *dev, struct list_head *list);
  349 +netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev);
351 350 #ifdef CONFIG_NET_POLL_CONTROLLER
352 351 static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
353 352 struct sk_buff *skb)
... ... @@ -358,8 +357,8 @@
358 357 netpoll_send_skb(np, skb);
359 358 }
360 359  
361   -extern int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp);
362   -extern void br_netpoll_disable(struct net_bridge_port *p);
  360 +int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp);
  361 +void br_netpoll_disable(struct net_bridge_port *p);
363 362 #else
364 363 static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
365 364 struct sk_buff *skb)
366 365  
367 366  
368 367  
369 368  
370 369  
371 370  
372 371  
... ... @@ -377,116 +376,99 @@
377 376 #endif
378 377  
379 378 /* br_fdb.c */
380   -extern int br_fdb_init(void);
381   -extern void br_fdb_fini(void);
382   -extern void br_fdb_flush(struct net_bridge *br);
383   -extern void br_fdb_changeaddr(struct net_bridge_port *p,
384   - const unsigned char *newaddr);
385   -extern void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);
386   -extern void br_fdb_cleanup(unsigned long arg);
387   -extern void br_fdb_delete_by_port(struct net_bridge *br,
388   - const struct net_bridge_port *p, int do_all);
389   -extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
390   - const unsigned char *addr,
391   - __u16 vid);
392   -extern int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);
393   -extern int br_fdb_fillbuf(struct net_bridge *br, void *buf,
394   - unsigned long count, unsigned long off);
395   -extern int br_fdb_insert(struct net_bridge *br,
396   - struct net_bridge_port *source,
397   - const unsigned char *addr,
398   - u16 vid);
399   -extern void br_fdb_update(struct net_bridge *br,
400   - struct net_bridge_port *source,
401   - const unsigned char *addr,
402   - u16 vid);
403   -extern int fdb_delete_by_addr(struct net_bridge *br, const u8 *addr, u16 vid);
  379 +int br_fdb_init(void);
  380 +void br_fdb_fini(void);
  381 +void br_fdb_flush(struct net_bridge *br);
  382 +void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr);
  383 +void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);
  384 +void br_fdb_cleanup(unsigned long arg);
  385 +void br_fdb_delete_by_port(struct net_bridge *br,
  386 + const struct net_bridge_port *p, int do_all);
  387 +struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
  388 + const unsigned char *addr, __u16 vid);
  389 +int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);
  390 +int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count,
  391 + unsigned long off);
  392 +int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
  393 + const unsigned char *addr, u16 vid);
  394 +void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
  395 + const unsigned char *addr, u16 vid);
  396 +int fdb_delete_by_addr(struct net_bridge *br, const u8 *addr, u16 vid);
404 397  
405   -extern int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
406   - struct net_device *dev,
407   - const unsigned char *addr);
408   -extern int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[],
409   - struct net_device *dev,
410   - const unsigned char *addr,
411   - u16 nlh_flags);
412   -extern int br_fdb_dump(struct sk_buff *skb,
413   - struct netlink_callback *cb,
414   - struct net_device *dev,
415   - int idx);
  398 +int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
  399 + struct net_device *dev, const unsigned char *addr);
  400 +int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
  401 + const unsigned char *addr, u16 nlh_flags);
  402 +int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
  403 + struct net_device *dev, int idx);
416 404  
417 405 /* br_forward.c */
418   -extern void br_deliver(const struct net_bridge_port *to,
419   - struct sk_buff *skb);
420   -extern int br_dev_queue_push_xmit(struct sk_buff *skb);
421   -extern void br_forward(const struct net_bridge_port *to,
  406 +void br_deliver(const struct net_bridge_port *to, struct sk_buff *skb);
  407 +int br_dev_queue_push_xmit(struct sk_buff *skb);
  408 +void br_forward(const struct net_bridge_port *to,
422 409 struct sk_buff *skb, struct sk_buff *skb0);
423   -extern int br_forward_finish(struct sk_buff *skb);
424   -extern void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb,
425   - bool unicast);
426   -extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
427   - struct sk_buff *skb2, bool unicast);
  410 +int br_forward_finish(struct sk_buff *skb);
  411 +void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast);
  412 +void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
  413 + struct sk_buff *skb2, bool unicast);
428 414  
429 415 /* br_if.c */
430   -extern void br_port_carrier_check(struct net_bridge_port *p);
431   -extern int br_add_bridge(struct net *net, const char *name);
432   -extern int br_del_bridge(struct net *net, const char *name);
433   -extern void br_net_exit(struct net *net);
434   -extern int br_add_if(struct net_bridge *br,
435   - struct net_device *dev);
436   -extern int br_del_if(struct net_bridge *br,
437   - struct net_device *dev);
438   -extern int br_min_mtu(const struct net_bridge *br);
439   -extern netdev_features_t br_features_recompute(struct net_bridge *br,
440   - netdev_features_t features);
  416 +void br_port_carrier_check(struct net_bridge_port *p);
  417 +int br_add_bridge(struct net *net, const char *name);
  418 +int br_del_bridge(struct net *net, const char *name);
  419 +void br_net_exit(struct net *net);
  420 +int br_add_if(struct net_bridge *br, struct net_device *dev);
  421 +int br_del_if(struct net_bridge *br, struct net_device *dev);
  422 +int br_min_mtu(const struct net_bridge *br);
  423 +netdev_features_t br_features_recompute(struct net_bridge *br,
  424 + netdev_features_t features);
441 425  
442 426 /* br_input.c */
443   -extern int br_handle_frame_finish(struct sk_buff *skb);
444   -extern rx_handler_result_t br_handle_frame(struct sk_buff **pskb);
  427 +int br_handle_frame_finish(struct sk_buff *skb);
  428 +rx_handler_result_t br_handle_frame(struct sk_buff **pskb);
445 429  
446 430 /* br_ioctl.c */
447   -extern int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
448   -extern int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *arg);
  431 +int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
  432 +int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd,
  433 + void __user *arg);
449 434  
450 435 /* br_multicast.c */
451 436 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
452 437 extern unsigned int br_mdb_rehash_seq;
453   -extern int br_multicast_rcv(struct net_bridge *br,
454   - struct net_bridge_port *port,
455   - struct sk_buff *skb);
456   -extern struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
457   - struct sk_buff *skb, u16 vid);
458   -extern void br_multicast_add_port(struct net_bridge_port *port);
459   -extern void br_multicast_del_port(struct net_bridge_port *port);
460   -extern void br_multicast_enable_port(struct net_bridge_port *port);
461   -extern void br_multicast_disable_port(struct net_bridge_port *port);
462   -extern void br_multicast_init(struct net_bridge *br);
463   -extern void br_multicast_open(struct net_bridge *br);
464   -extern void br_multicast_stop(struct net_bridge *br);
465   -extern void br_multicast_deliver(struct net_bridge_mdb_entry *mdst,
466   - struct sk_buff *skb);
467   -extern void br_multicast_forward(struct net_bridge_mdb_entry *mdst,
468   - struct sk_buff *skb, struct sk_buff *skb2);
469   -extern int br_multicast_set_router(struct net_bridge *br, unsigned long val);
470   -extern int br_multicast_set_port_router(struct net_bridge_port *p,
471   - unsigned long val);
472   -extern int br_multicast_toggle(struct net_bridge *br, unsigned long val);
473   -extern int br_multicast_set_querier(struct net_bridge *br, unsigned long val);
474   -extern int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);
475   -extern struct net_bridge_mdb_entry *br_mdb_ip_get(
476   - struct net_bridge_mdb_htable *mdb,
477   - struct br_ip *dst);
478   -extern struct net_bridge_mdb_entry *br_multicast_new_group(struct net_bridge *br,
479   - struct net_bridge_port *port, struct br_ip *group);
480   -extern void br_multicast_free_pg(struct rcu_head *head);
481   -extern struct net_bridge_port_group *br_multicast_new_port_group(
482   - struct net_bridge_port *port,
483   - struct br_ip *group,
484   - struct net_bridge_port_group __rcu *next,
485   - unsigned char state);
486   -extern void br_mdb_init(void);
487   -extern void br_mdb_uninit(void);
488   -extern void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
489   - struct br_ip *group, int type);
  438 +int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,
  439 + struct sk_buff *skb);
  440 +struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
  441 + struct sk_buff *skb, u16 vid);
  442 +void br_multicast_add_port(struct net_bridge_port *port);
  443 +void br_multicast_del_port(struct net_bridge_port *port);
  444 +void br_multicast_enable_port(struct net_bridge_port *port);
  445 +void br_multicast_disable_port(struct net_bridge_port *port);
  446 +void br_multicast_init(struct net_bridge *br);
  447 +void br_multicast_open(struct net_bridge *br);
  448 +void br_multicast_stop(struct net_bridge *br);
  449 +void br_multicast_deliver(struct net_bridge_mdb_entry *mdst,
  450 + struct sk_buff *skb);
  451 +void br_multicast_forward(struct net_bridge_mdb_entry *mdst,
  452 + struct sk_buff *skb, struct sk_buff *skb2);
  453 +int br_multicast_set_router(struct net_bridge *br, unsigned long val);
  454 +int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val);
  455 +int br_multicast_toggle(struct net_bridge *br, unsigned long val);
  456 +int br_multicast_set_querier(struct net_bridge *br, unsigned long val);
  457 +int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);
  458 +struct net_bridge_mdb_entry *
  459 +br_mdb_ip_get(struct net_bridge_mdb_htable *mdb, struct br_ip *dst);
  460 +struct net_bridge_mdb_entry *
  461 +br_multicast_new_group(struct net_bridge *br, struct net_bridge_port *port,
  462 + struct br_ip *group);
  463 +void br_multicast_free_pg(struct rcu_head *head);
  464 +struct net_bridge_port_group *
  465 +br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
  466 + struct net_bridge_port_group __rcu *next,
  467 + unsigned char state);
  468 +void br_mdb_init(void);
  469 +void br_mdb_uninit(void);
  470 +void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
  471 + struct br_ip *group, int type);
490 472  
491 473 #define mlock_dereference(X, br) \
492 474 rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
... ... @@ -591,22 +573,21 @@
591 573  
592 574 /* br_vlan.c */
593 575 #ifdef CONFIG_BRIDGE_VLAN_FILTERING
594   -extern bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
595   - struct sk_buff *skb, u16 *vid);
596   -extern bool br_allowed_egress(struct net_bridge *br,
597   - const struct net_port_vlans *v,
598   - const struct sk_buff *skb);
599   -extern struct sk_buff *br_handle_vlan(struct net_bridge *br,
600   - const struct net_port_vlans *v,
601   - struct sk_buff *skb);
602   -extern int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags);
603   -extern int br_vlan_delete(struct net_bridge *br, u16 vid);
604   -extern void br_vlan_flush(struct net_bridge *br);
605   -extern int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
606   -extern int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags);
607   -extern int nbp_vlan_delete(struct net_bridge_port *port, u16 vid);
608   -extern void nbp_vlan_flush(struct net_bridge_port *port);
609   -extern bool nbp_vlan_find(struct net_bridge_port *port, u16 vid);
  576 +bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
  577 + struct sk_buff *skb, u16 *vid);
  578 +bool br_allowed_egress(struct net_bridge *br, const struct net_port_vlans *v,
  579 + const struct sk_buff *skb);
  580 +struct sk_buff *br_handle_vlan(struct net_bridge *br,
  581 + const struct net_port_vlans *v,
  582 + struct sk_buff *skb);
  583 +int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags);
  584 +int br_vlan_delete(struct net_bridge *br, u16 vid);
  585 +void br_vlan_flush(struct net_bridge *br);
  586 +int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
  587 +int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags);
  588 +int nbp_vlan_delete(struct net_bridge_port *port, u16 vid);
  589 +void nbp_vlan_flush(struct net_bridge_port *port);
  590 +bool nbp_vlan_find(struct net_bridge_port *port, u16 vid);
610 591  
611 592 static inline struct net_port_vlans *br_get_vlan_info(
612 593 const struct net_bridge *br)
... ... @@ -727,9 +708,9 @@
727 708  
728 709 /* br_netfilter.c */
729 710 #ifdef CONFIG_BRIDGE_NETFILTER
730   -extern int br_netfilter_init(void);
731   -extern void br_netfilter_fini(void);
732   -extern void br_netfilter_rtable_init(struct net_bridge *);
  711 +int br_netfilter_init(void);
  712 +void br_netfilter_fini(void);
  713 +void br_netfilter_rtable_init(struct net_bridge *);
733 714 #else
734 715 #define br_netfilter_init() (0)
735 716 #define br_netfilter_fini() do { } while(0)
736 717  
737 718  
738 719  
739 720  
... ... @@ -737,43 +718,39 @@
737 718 #endif
738 719  
739 720 /* br_stp.c */
740   -extern void br_log_state(const struct net_bridge_port *p);
741   -extern struct net_bridge_port *br_get_port(struct net_bridge *br,
742   - u16 port_no);
743   -extern void br_init_port(struct net_bridge_port *p);
744   -extern void br_become_designated_port(struct net_bridge_port *p);
  721 +void br_log_state(const struct net_bridge_port *p);
  722 +struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
  723 +void br_init_port(struct net_bridge_port *p);
  724 +void br_become_designated_port(struct net_bridge_port *p);
745 725  
746   -extern void __br_set_forward_delay(struct net_bridge *br, unsigned long t);
747   -extern int br_set_forward_delay(struct net_bridge *br, unsigned long x);
748   -extern int br_set_hello_time(struct net_bridge *br, unsigned long x);
749   -extern int br_set_max_age(struct net_bridge *br, unsigned long x);
  726 +void __br_set_forward_delay(struct net_bridge *br, unsigned long t);
  727 +int br_set_forward_delay(struct net_bridge *br, unsigned long x);
  728 +int br_set_hello_time(struct net_bridge *br, unsigned long x);
  729 +int br_set_max_age(struct net_bridge *br, unsigned long x);
750 730  
751 731  
752 732 /* br_stp_if.c */
753   -extern void br_stp_enable_bridge(struct net_bridge *br);
754   -extern void br_stp_disable_bridge(struct net_bridge *br);
755   -extern void br_stp_set_enabled(struct net_bridge *br, unsigned long val);
756   -extern void br_stp_enable_port(struct net_bridge_port *p);
757   -extern void br_stp_disable_port(struct net_bridge_port *p);
758   -extern bool br_stp_recalculate_bridge_id(struct net_bridge *br);
759   -extern void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *a);
760   -extern void br_stp_set_bridge_priority(struct net_bridge *br,
761   - u16 newprio);
762   -extern int br_stp_set_port_priority(struct net_bridge_port *p,
763   - unsigned long newprio);
764   -extern int br_stp_set_path_cost(struct net_bridge_port *p,
765   - unsigned long path_cost);
766   -extern ssize_t br_show_bridge_id(char *buf, const struct bridge_id *id);
  733 +void br_stp_enable_bridge(struct net_bridge *br);
  734 +void br_stp_disable_bridge(struct net_bridge *br);
  735 +void br_stp_set_enabled(struct net_bridge *br, unsigned long val);
  736 +void br_stp_enable_port(struct net_bridge_port *p);
  737 +void br_stp_disable_port(struct net_bridge_port *p);
  738 +bool br_stp_recalculate_bridge_id(struct net_bridge *br);
  739 +void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *a);
  740 +void br_stp_set_bridge_priority(struct net_bridge *br, u16 newprio);
  741 +int br_stp_set_port_priority(struct net_bridge_port *p, unsigned long newprio);
  742 +int br_stp_set_path_cost(struct net_bridge_port *p, unsigned long path_cost);
  743 +ssize_t br_show_bridge_id(char *buf, const struct bridge_id *id);
767 744  
768 745 /* br_stp_bpdu.c */
769 746 struct stp_proto;
770   -extern void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
771   - struct net_device *dev);
  747 +void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
  748 + struct net_device *dev);
772 749  
773 750 /* br_stp_timer.c */
774   -extern void br_stp_timer_init(struct net_bridge *br);
775   -extern void br_stp_port_timer_init(struct net_bridge_port *p);
776   -extern unsigned long br_timer_value(const struct timer_list *timer);
  751 +void br_stp_timer_init(struct net_bridge *br);
  752 +void br_stp_port_timer_init(struct net_bridge_port *p);
  753 +unsigned long br_timer_value(const struct timer_list *timer);
777 754  
778 755 /* br.c */
779 756 #if IS_ENABLED(CONFIG_ATM_LANE)
780 757  
781 758  
... ... @@ -782,23 +759,23 @@
782 759  
783 760 /* br_netlink.c */
784 761 extern struct rtnl_link_ops br_link_ops;
785   -extern int br_netlink_init(void);
786   -extern void br_netlink_fini(void);
787   -extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
788   -extern int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg);
789   -extern int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg);
790   -extern int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
791   - struct net_device *dev, u32 filter_mask);
  762 +int br_netlink_init(void);
  763 +void br_netlink_fini(void);
  764 +void br_ifinfo_notify(int event, struct net_bridge_port *port);
  765 +int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg);
  766 +int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg);
  767 +int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,
  768 + u32 filter_mask);
792 769  
793 770 #ifdef CONFIG_SYSFS
794 771 /* br_sysfs_if.c */
795 772 extern const struct sysfs_ops brport_sysfs_ops;
796   -extern int br_sysfs_addif(struct net_bridge_port *p);
797   -extern int br_sysfs_renameif(struct net_bridge_port *p);
  773 +int br_sysfs_addif(struct net_bridge_port *p);
  774 +int br_sysfs_renameif(struct net_bridge_port *p);
798 775  
799 776 /* br_sysfs_br.c */
800   -extern int br_sysfs_addbr(struct net_device *dev);
801   -extern void br_sysfs_delbr(struct net_device *dev);
  777 +int br_sysfs_addbr(struct net_device *dev);
  778 +void br_sysfs_delbr(struct net_device *dev);
802 779  
803 780 #else
804 781  
net/bridge/br_private_stp.h
Diff comments   View file @ 348662a
... ... @@ -51,20 +51,20 @@
51 51  
52 52  
53 53 /* br_stp.c */
54   -extern void br_become_root_bridge(struct net_bridge *br);
55   -extern void br_config_bpdu_generation(struct net_bridge *);
56   -extern void br_configuration_update(struct net_bridge *);
57   -extern void br_port_state_selection(struct net_bridge *);
58   -extern void br_received_config_bpdu(struct net_bridge_port *p,
59   - const struct br_config_bpdu *bpdu);
60   -extern void br_received_tcn_bpdu(struct net_bridge_port *p);
61   -extern void br_transmit_config(struct net_bridge_port *p);
62   -extern void br_transmit_tcn(struct net_bridge *br);
63   -extern void br_topology_change_detection(struct net_bridge *br);
  54 +void br_become_root_bridge(struct net_bridge *br);
  55 +void br_config_bpdu_generation(struct net_bridge *);
  56 +void br_configuration_update(struct net_bridge *);
  57 +void br_port_state_selection(struct net_bridge *);
  58 +void br_received_config_bpdu(struct net_bridge_port *p,
  59 + const struct br_config_bpdu *bpdu);
  60 +void br_received_tcn_bpdu(struct net_bridge_port *p);
  61 +void br_transmit_config(struct net_bridge_port *p);
  62 +void br_transmit_tcn(struct net_bridge *br);
  63 +void br_topology_change_detection(struct net_bridge *br);
64 64  
65 65 /* br_stp_bpdu.c */
66   -extern void br_send_config_bpdu(struct net_bridge_port *, struct br_config_bpdu *);
67   -extern void br_send_tcn_bpdu(struct net_bridge_port *);
  66 +void br_send_config_bpdu(struct net_bridge_port *, struct br_config_bpdu *);
  67 +void br_send_tcn_bpdu(struct net_bridge_port *);
68 68  
69 69 #endif
... ... @@ -108,9 +108,9 @@
108 108 extern struct dev_rcv_lists can_rx_alldev_list;
109 109  
110 110 /* function prototypes for the CAN networklayer procfs (proc.c) */
111   -extern void can_init_proc(void);
112   -extern void can_remove_proc(void);
113   -extern void can_stat_update(unsigned long data);
  111 +void can_init_proc(void);
  112 +void can_remove_proc(void);
  113 +void can_stat_update(unsigned long data);
114 114  
115 115 /* structures and variables from af_can.c needed in proc.c for reading */
116 116 extern struct timer_list can_stattimer; /* timer for statistics update */
net/ceph/auth_none.h
Diff comments   View file @ 348662a
... ... @@ -23,7 +23,7 @@
23 23 struct ceph_none_authorizer au; /* we only need one; it's static */
24 24 };
25 25  
26   -extern int ceph_auth_none_init(struct ceph_auth_client *ac);
  26 +int ceph_auth_none_init(struct ceph_auth_client *ac);
27 27  
28 28 #endif
... ... @@ -45,7 +45,7 @@
45 45 struct ceph_x_authorizer auth_authorizer;
46 46 };
47 47  
48   -extern int ceph_x_init(struct ceph_auth_client *ac);
  48 +int ceph_x_init(struct ceph_auth_client *ac);
49 49  
50 50 #endif
... ... @@ -20,35 +20,33 @@
20 20 kfree(key->key);
21 21 }
22 22  
23   -extern int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
24   - const struct ceph_crypto_key *src);
25   -extern int ceph_crypto_key_encode(struct ceph_crypto_key *key,
26   - void **p, void *end);
27   -extern int ceph_crypto_key_decode(struct ceph_crypto_key *key,
28   - void **p, void *end);
29   -extern int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
  23 +int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
  24 + const struct ceph_crypto_key *src);
  25 +int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end);
  26 +int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end);
  27 +int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
30 28  
31 29 /* crypto.c */
32   -extern int ceph_decrypt(struct ceph_crypto_key *secret,
33   - void *dst, size_t *dst_len,
34   - const void *src, size_t src_len);
35   -extern int ceph_encrypt(struct ceph_crypto_key *secret,
36   - void *dst, size_t *dst_len,
37   - const void *src, size_t src_len);
38   -extern int ceph_decrypt2(struct ceph_crypto_key *secret,
39   - void *dst1, size_t *dst1_len,
40   - void *dst2, size_t *dst2_len,
41   - const void *src, size_t src_len);
42   -extern int ceph_encrypt2(struct ceph_crypto_key *secret,
43   - void *dst, size_t *dst_len,
44   - const void *src1, size_t src1_len,
45   - const void *src2, size_t src2_len);
46   -extern int ceph_crypto_init(void);
47   -extern void ceph_crypto_shutdown(void);
  30 +int ceph_decrypt(struct ceph_crypto_key *secret,
  31 + void *dst, size_t *dst_len,
  32 + const void *src, size_t src_len);
  33 +int ceph_encrypt(struct ceph_crypto_key *secret,
  34 + void *dst, size_t *dst_len,
  35 + const void *src, size_t src_len);
  36 +int ceph_decrypt2(struct ceph_crypto_key *secret,
  37 + void *dst1, size_t *dst1_len,
  38 + void *dst2, size_t *dst2_len,
  39 + const void *src, size_t src_len);
  40 +int ceph_encrypt2(struct ceph_crypto_key *secret,
  41 + void *dst, size_t *dst_len,
  42 + const void *src1, size_t src1_len,
  43 + const void *src2, size_t src2_len);
  44 +int ceph_crypto_init(void);
  45 +void ceph_crypto_shutdown(void);
48 46  
49 47 /* armor.c */
50   -extern int ceph_armor(char *dst, const char *src, const char *end);
51   -extern int ceph_unarmor(char *dst, const char *src, const char *end);
  48 +int ceph_armor(char *dst, const char *src, const char *end);
  49 +int ceph_unarmor(char *dst, const char *src, const char *end);
52 50  
53 51 #endif