Skip to content

L
linux
Commit bf3c710f authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

llc*.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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb7d3d71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 333 deletions
include/net/llc.h
View file @ bf3c710f
...@@ -95,29 +95,29 @@ struct hlist_nulls_head *llc_sk_laddr_hash(struct llc_sap *sap, ...@@ -95,29 +95,29 @@ struct hlist_nulls_head *llc_sk_laddr_hash(struct llc_sap *sap,
extern struct list_head llc_sap_list; extern struct list_head llc_sap_list;
extern spinlock_t llc_sap_list_lock; extern spinlock_t llc_sap_list_lock;
extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, int llc_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
struct packet_type *pt, struct net_device *orig_dev); struct net_device *orig_dev);
extern int llc_mac_hdr_init(struct sk_buff *skb, int llc_mac_hdr_init(struct sk_buff *skb, const unsigned char *sa,
const unsigned char *sa, const unsigned char *da); const unsigned char *da);
extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap, void llc_add_pack(int type,
struct sk_buff *skb)); void (*handler)(struct llc_sap *sap, struct sk_buff *skb));
extern void llc_remove_pack(int type); void llc_remove_pack(int type);
extern void llc_set_station_handler(void (*handler)(struct sk_buff *skb)); void llc_set_station_handler(void (*handler)(struct sk_buff *skb));
extern struct llc_sap *llc_sap_open(unsigned char lsap, struct llc_sap *llc_sap_open(unsigned char lsap,
int (*rcv)(struct sk_buff *skb, int (*rcv)(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct packet_type *pt, struct packet_type *pt,
struct net_device *orig_dev)); struct net_device *orig_dev));
static inline void llc_sap_hold(struct llc_sap *sap) static inline void llc_sap_hold(struct llc_sap *sap)
{ {
atomic_inc(&sap->refcnt); atomic_inc(&sap->refcnt);
} }
extern void llc_sap_close(struct llc_sap *sap); void llc_sap_close(struct llc_sap *sap);
static inline void llc_sap_put(struct llc_sap *sap) static inline void llc_sap_put(struct llc_sap *sap)
{ {
...@@ -125,27 +125,27 @@ static inline void llc_sap_put(struct llc_sap *sap) ...@@ -125,27 +125,27 @@ static inline void llc_sap_put(struct llc_sap *sap)
llc_sap_close(sap); llc_sap_close(sap);
} }
extern struct llc_sap *llc_sap_find(unsigned char sap_value); struct llc_sap *llc_sap_find(unsigned char sap_value);
extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb, int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
unsigned char *dmac, unsigned char dsap); unsigned char *dmac, unsigned char dsap);
extern void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb); void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
extern void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb); void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
extern void llc_station_init(void); void llc_station_init(void);
extern void llc_station_exit(void); void llc_station_exit(void);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern int llc_proc_init(void); int llc_proc_init(void);
extern void llc_proc_exit(void); void llc_proc_exit(void);
#else #else
#define llc_proc_init() (0) #define llc_proc_init() (0)
#define llc_proc_exit() do { } while(0) #define llc_proc_exit() do { } while(0)
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
extern int llc_sysctl_init(void); int llc_sysctl_init(void);
extern void llc_sysctl_exit(void); void llc_sysctl_exit(void);
extern int sysctl_llc2_ack_timeout; extern int sysctl_llc2_ack_timeout;
extern int sysctl_llc2_busy_timeout; extern int sysctl_llc2_busy_timeout;
......
include/net/llc_c_ac.h
View file @ bf3c710f
This diff is collapsed.
include/net/llc_c_ev.h
View file @ bf3c710f
This diff is collapsed.
include/net/llc_conn.h
View file @ bf3c710f
...@@ -95,28 +95,24 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb) ...@@ -95,28 +95,24 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb)
return skb->cb[sizeof(skb->cb) - 1]; return skb->cb[sizeof(skb->cb) - 1];
} }
extern struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority,
struct proto *prot); struct proto *prot);
extern void llc_sk_free(struct sock *sk); void llc_sk_free(struct sock *sk);
extern void llc_sk_reset(struct sock *sk); void llc_sk_reset(struct sock *sk);
/* Access to a connection */ /* Access to a connection */
extern int llc_conn_state_process(struct sock *sk, struct sk_buff *skb); int llc_conn_state_process(struct sock *sk, struct sk_buff *skb);
extern void llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb); void llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb);
extern void llc_conn_rtn_pdu(struct sock *sk, struct sk_buff *skb); void llc_conn_rtn_pdu(struct sock *sk, struct sk_buff *skb);
extern void llc_conn_resend_i_pdu_as_cmd(struct sock *sk, u8 nr, void llc_conn_resend_i_pdu_as_cmd(struct sock *sk, u8 nr, u8 first_p_bit);
u8 first_p_bit); void llc_conn_resend_i_pdu_as_rsp(struct sock *sk, u8 nr, u8 first_f_bit);
extern void llc_conn_resend_i_pdu_as_rsp(struct sock *sk, u8 nr, int llc_conn_remove_acked_pdus(struct sock *conn, u8 nr, u16 *how_many_unacked);
u8 first_f_bit); struct sock *llc_lookup_established(struct llc_sap *sap, struct llc_addr *daddr,
extern int llc_conn_remove_acked_pdus(struct sock *conn, u8 nr, struct llc_addr *laddr);
u16 *how_many_unacked); void llc_sap_add_socket(struct llc_sap *sap, struct sock *sk);
extern struct sock *llc_lookup_established(struct llc_sap *sap, void llc_sap_remove_socket(struct llc_sap *sap, struct sock *sk);
struct llc_addr *daddr,
struct llc_addr *laddr);
extern void llc_sap_add_socket(struct llc_sap *sap, struct sock *sk);
extern void llc_sap_remove_socket(struct llc_sap *sap, struct sock *sk);
extern u8 llc_data_accept_state(u8 state); u8 llc_data_accept_state(u8 state);
extern void llc_build_offset_table(void); void llc_build_offset_table(void);
#endif /* LLC_CONN_H */ #endif /* LLC_CONN_H */
include/net/llc_if.h
View file @ bf3c710f
...@@ -62,8 +62,7 @@ ...@@ -62,8 +62,7 @@
#define LLC_STATUS_CONFLICT 7 /* disconnect conn */ #define LLC_STATUS_CONFLICT 7 /* disconnect conn */
#define LLC_STATUS_RESET_DONE 8 /* */ #define LLC_STATUS_RESET_DONE 8 /* */
extern int llc_establish_connection(struct sock *sk, u8 *lmac, int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap);
u8 *dmac, u8 dsap); int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
extern int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb); int llc_send_disc(struct sock *sk);
extern int llc_send_disc(struct sock *sk);
#endif /* LLC_IF_H */ #endif /* LLC_IF_H */
include/net/llc_pdu.h
View file @ bf3c710f
...@@ -410,21 +410,20 @@ struct llc_frmr_info { ...@@ -410,21 +410,20 @@ struct llc_frmr_info {
u8 ind_bits; /* indicator bits set with macro */ u8 ind_bits; /* indicator bits set with macro */
} __packed; } __packed;
extern void llc_pdu_set_cmd_rsp(struct sk_buff *skb, u8 type); void llc_pdu_set_cmd_rsp(struct sk_buff *skb, u8 type);
extern void llc_pdu_set_pf_bit(struct sk_buff *skb, u8 bit_value); void llc_pdu_set_pf_bit(struct sk_buff *skb, u8 bit_value);
extern void llc_pdu_decode_pf_bit(struct sk_buff *skb, u8 *pf_bit); void llc_pdu_decode_pf_bit(struct sk_buff *skb, u8 *pf_bit);
extern void llc_pdu_init_as_disc_cmd(struct sk_buff *skb, u8 p_bit); void llc_pdu_init_as_disc_cmd(struct sk_buff *skb, u8 p_bit);
extern void llc_pdu_init_as_i_cmd(struct sk_buff *skb, u8 p_bit, u8 ns, u8 nr); void llc_pdu_init_as_i_cmd(struct sk_buff *skb, u8 p_bit, u8 ns, u8 nr);
extern void llc_pdu_init_as_rej_cmd(struct sk_buff *skb, u8 p_bit, u8 nr); void llc_pdu_init_as_rej_cmd(struct sk_buff *skb, u8 p_bit, u8 nr);
extern void llc_pdu_init_as_rnr_cmd(struct sk_buff *skb, u8 p_bit, u8 nr); void llc_pdu_init_as_rnr_cmd(struct sk_buff *skb, u8 p_bit, u8 nr);
extern void llc_pdu_init_as_rr_cmd(struct sk_buff *skb, u8 p_bit, u8 nr); void llc_pdu_init_as_rr_cmd(struct sk_buff *skb, u8 p_bit, u8 nr);
extern void llc_pdu_init_as_sabme_cmd(struct sk_buff *skb, u8 p_bit); void llc_pdu_init_as_sabme_cmd(struct sk_buff *skb, u8 p_bit);
extern void llc_pdu_init_as_dm_rsp(struct sk_buff *skb, u8 f_bit); void llc_pdu_init_as_dm_rsp(struct sk_buff *skb, u8 f_bit);
extern void llc_pdu_init_as_frmr_rsp(struct sk_buff *skb, void llc_pdu_init_as_frmr_rsp(struct sk_buff *skb, struct llc_pdu_sn *prev_pdu,
struct llc_pdu_sn *prev_pdu, u8 f_bit, u8 vs, u8 vr, u8 vzyxw);
u8 f_bit, u8 vs, u8 vr, u8 vzyxw); void llc_pdu_init_as_rr_rsp(struct sk_buff *skb, u8 f_bit, u8 nr);
extern void llc_pdu_init_as_rr_rsp(struct sk_buff *skb, u8 f_bit, u8 nr); void llc_pdu_init_as_rej_rsp(struct sk_buff *skb, u8 f_bit, u8 nr);
extern void llc_pdu_init_as_rej_rsp(struct sk_buff *skb, u8 f_bit, u8 nr); void llc_pdu_init_as_rnr_rsp(struct sk_buff *skb, u8 f_bit, u8 nr);
extern void llc_pdu_init_as_rnr_rsp(struct sk_buff *skb, u8 f_bit, u8 nr); void llc_pdu_init_as_ua_rsp(struct sk_buff *skb, u8 f_bit);
extern void llc_pdu_init_as_ua_rsp(struct sk_buff *skb, u8 f_bit);
#endif /* LLC_PDU_H */ #endif /* LLC_PDU_H */
include/net/llc_s_ac.h
View file @ bf3c710f
...@@ -25,15 +25,13 @@ ...@@ -25,15 +25,13 @@
/* All action functions must look like this */ /* All action functions must look like this */
typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb); typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_unitdata_ind(struct llc_sap *sap, int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
struct sk_buff *skb); int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_action_send_xid_c(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_send_xid_c(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_action_send_xid_r(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_send_xid_r(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_action_send_test_c(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_send_test_c(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_action_report_status(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_report_status(struct llc_sap *sap, int llc_sap_action_xid_ind(struct llc_sap *sap, struct sk_buff *skb);
struct sk_buff *skb); int llc_sap_action_test_ind(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_xid_ind(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_action_test_ind(struct llc_sap *sap, struct sk_buff *skb);
#endif /* LLC_S_AC_H */ #endif /* LLC_S_AC_H */
include/net/llc_s_ev.h
View file @ bf3c710f
...@@ -53,15 +53,14 @@ struct llc_sap; ...@@ -53,15 +53,14 @@ struct llc_sap;
typedef int (*llc_sap_ev_t)(struct llc_sap *sap, struct sk_buff *skb); typedef int (*llc_sap_ev_t)(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_activation_req(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_activation_req(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_rx_ui(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_rx_ui(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_unitdata_req(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_unitdata_req(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_xid_req(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_xid_req(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_rx_xid_c(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_rx_xid_c(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_rx_xid_r(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_rx_xid_r(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_test_req(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_test_req(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_rx_test_c(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_rx_test_c(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_rx_test_r(struct llc_sap *sap, struct sk_buff *skb); int llc_sap_ev_rx_test_r(struct llc_sap *sap, struct sk_buff *skb);
extern int llc_sap_ev_deactivation_req(struct llc_sap *sap, int llc_sap_ev_deactivation_req(struct llc_sap *sap, struct sk_buff *skb);
struct sk_buff *skb);
#endif /* LLC_S_EV_H */ #endif /* LLC_S_EV_H */
include/net/llc_sap.h
View file @ bf3c710f
...@@ -19,18 +19,14 @@ struct net_device; ...@@ -19,18 +19,14 @@ struct net_device;
struct sk_buff; struct sk_buff;
struct sock; struct sock;
extern void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb); void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb);
extern void llc_save_primitive(struct sock *sk, struct sk_buff* skb, void llc_save_primitive(struct sock *sk, struct sk_buff *skb,
unsigned char prim); unsigned char prim);
extern struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev, struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev,
u8 type, u32 data_size); u8 type, u32 data_size);
extern void llc_build_and_send_test_pkt(struct llc_sap *sap, void llc_build_and_send_test_pkt(struct llc_sap *sap, struct sk_buff *skb,
struct sk_buff *skb, unsigned char *dmac, unsigned char dsap);
unsigned char *dmac, void llc_build_and_send_xid_pkt(struct llc_sap *sap, struct sk_buff *skb,
unsigned char dsap); unsigned char *dmac, unsigned char dsap);
extern void llc_build_and_send_xid_pkt(struct llc_sap *sap,
struct sk_buff *skb,
unsigned char *dmac,
unsigned char dsap);
#endif /* LLC_SAP_H */ #endif /* LLC_SAP_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7