Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2928c19e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

[LLC]: Fix sparse warnings 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 0519d8fb

include/net/llc.h

+11 −2
Original line number Diff line number Diff line
@@ -89,10 +89,10 @@ static inline void llc_sap_hold(struct llc_sap *sap) 
	atomic_inc(&sap->refcnt);

}



static inline void llc_sap_put(struct llc_sap *sap)

{

extern void llc_sap_close(struct llc_sap *sap);



static inline void llc_sap_put(struct llc_sap *sap)

{

	if (atomic_dec_and_test(&sap->refcnt))

		llc_sap_close(sap);

}
@@ -102,6 +102,9 @@ extern 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,

				     unsigned char *dmac, unsigned char dsap);



extern 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);



extern int llc_station_init(void);

extern void llc_station_exit(void);
@@ -115,6 +118,12 @@ extern void llc_proc_exit(void); 
#ifdef CONFIG_SYSCTL

extern int llc_sysctl_init(void);

extern void llc_sysctl_exit(void);



extern int sysctl_llc2_ack_timeout;

extern int sysctl_llc2_busy_timeout;

extern int sysctl_llc2_p_timeout;

extern int sysctl_llc2_rej_timeout;

extern int sysctl_llc_station_ack_timeout;

#else

#define llc_sysctl_init() (0)

#define llc_sysctl_exit() do { } while(0)

include/net/llc_conn.h

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb) 
	return skb->cb[sizeof(skb->cb) - 1];

}



extern struct sock *llc_sk_alloc(int family, int priority, struct proto *prot);

extern struct sock *llc_sk_alloc(int family, unsigned int __nocast priority,

				 struct proto *prot);

extern void llc_sk_free(struct sock *sk);



extern void llc_sk_reset(struct sock *sk);

net/llc/af_llc.c

+1 −4
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout) 
	return rc;

}



int llc_wait_data(struct sock *sk, long timeo)

static int llc_wait_data(struct sock *sk, long timeo)

{

	int rc;
@@ -1003,9 +1003,6 @@ static struct proto_ops llc_ui_ops = { 
	.sendpage    = sock_no_sendpage,

};



extern 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);



static char llc_proc_err_msg[] __initdata =

        KERN_CRIT "LLC: Unable to register the proc_fs entries\n";

static char llc_sysctl_err_msg[] __initdata =

net/llc/llc_c_ac.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ int llc_conn_ac_set_vs_nr(struct sock *sk, struct sk_buff *skb) 
	return 0;

}



int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb)

static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb)

{

	llc_sk(sk)->vS = (llc_sk(sk)->vS + 1) % 128;

	return 0;

net/llc/llc_conn.c

+2 −1
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ static void llc_sk_init(struct sock* sk) 
 *	Allocates a LLC sock and initializes it. Returns the new LLC sock

 *	or %NULL if there's no memory available for one

 */

struct sock *llc_sk_alloc(int family, int priority, struct proto *prot)

struct sock *llc_sk_alloc(int family, unsigned int __nocast priority,

			 struct proto *prot)

{

	struct sock *sk = sk_alloc(family, priority, prot, 1);