Commit 590232a7 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

[LLC]: Add sysctl support for the LLC timeouts 



Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 54fb7f25

include/linux/sysctl.h

+25 −1
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ enum 
	NET_DECNET=15,

	NET_ECONET=16,

	NET_SCTP=17,

	NET_LLC=18,

};



/* /proc/sys/kernel/random */
@@ -522,6 +523,29 @@ enum { 
	NET_IPX_FORWARDING=2

};



/* /proc/sys/net/llc */

enum {

	NET_LLC2=1,

	NET_LLC_STATION=2,

};



/* /proc/sys/net/llc/llc2 */

enum {

	NET_LLC2_TIMEOUT=1,

};



/* /proc/sys/net/llc/station */

enum {

	NET_LLC_STATION_ACK_TIMEOUT=1,

};



/* /proc/sys/net/llc/llc2/timeout */

enum {

	NET_LLC2_ACK_TIMEOUT=1,

	NET_LLC2_P_TIMEOUT=2,

	NET_LLC2_REJ_TIMEOUT=3,

	NET_LLC2_BUSY_TIMEOUT=4,

};



/* /proc/sys/net/appletalk */

enum {

include/net/llc.h

+7 −0
Original line number Diff line number Diff line
@@ -98,4 +98,11 @@ extern void llc_proc_exit(void); 
#define llc_proc_init()	(0)

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

#endif /* CONFIG_PROC_FS */

#ifdef CONFIG_SYSCTL

extern int llc_sysctl_init(void);

extern void llc_sysctl_exit(void);

#else

#define llc_sysctl_init() (0)

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

#endif /* CONFIG_SYSCTL */

#endif /* LLC_H */

include/net/llc_conn.h

+5 −5
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
#define LLC_EVENT                1

#define LLC_PACKET               2



#define LLC_P_TIME               2

#define LLC_ACK_TIME             1

#define LLC_REJ_TIME             3

#define LLC_BUSY_TIME            3

#define LLC2_P_TIME               2

#define LLC2_ACK_TIME             1

#define LLC2_REJ_TIME             3

#define LLC2_BUSY_TIME            3



struct llc_timer {

	struct timer_list timer;

	u16		  expire;	/* timer expire time */

	unsigned long	  expire;	/* timer expire time */

};



struct llc_sock {

net/llc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ llc2-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_conn.o llc_c_st.o llc_pdu.o \ 
	  llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_station.o



llc2-$(CONFIG_PROC_FS) += llc_proc.o

llc2-$(CONFIG_SYSCTL)  += sysctl_net_llc.o

net/llc/af_llc.c

+35 −12
Original line number Diff line number Diff line
@@ -877,22 +877,22 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname, 
	case LLC_OPT_ACK_TMR_EXP:

		if (opt > LLC_OPT_MAX_ACK_TMR_EXP)

			goto out;

		llc->ack_timer.expire = opt;

		llc->ack_timer.expire = opt * HZ;

		break;

	case LLC_OPT_P_TMR_EXP:

		if (opt > LLC_OPT_MAX_P_TMR_EXP)

			goto out;

		llc->pf_cycle_timer.expire = opt;

		llc->pf_cycle_timer.expire = opt * HZ;

		break;

	case LLC_OPT_REJ_TMR_EXP:

		if (opt > LLC_OPT_MAX_REJ_TMR_EXP)

			goto out;

		llc->rej_sent_timer.expire = opt;

		llc->rej_sent_timer.expire = opt * HZ;

		break;

	case LLC_OPT_BUSY_TMR_EXP:

		if (opt > LLC_OPT_MAX_BUSY_TMR_EXP)

			goto out;

		llc->busy_state_timer.expire = opt;

		llc->busy_state_timer.expire = opt * HZ;

		break;

	case LLC_OPT_TX_WIN:

		if (opt > LLC_OPT_MAX_WIN)
@@ -946,13 +946,13 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname, 
	case LLC_OPT_SIZE:

		val = llc->n1;					break;

	case LLC_OPT_ACK_TMR_EXP:

		val = llc->ack_timer.expire;		break;

		val = llc->ack_timer.expire / HZ;		break;

	case LLC_OPT_P_TMR_EXP:

		val = llc->pf_cycle_timer.expire;	break;

		val = llc->pf_cycle_timer.expire / HZ;		break;

	case LLC_OPT_REJ_TMR_EXP:

		val = llc->rej_sent_timer.expire;	break;

		val = llc->rej_sent_timer.expire / HZ;		break;

	case LLC_OPT_BUSY_TMR_EXP:

		val = llc->busy_state_timer.expire;	break;

		val = llc->busy_state_timer.expire / HZ;	break;

	case LLC_OPT_TX_WIN:

		val = llc->k;				break;

	case LLC_OPT_RX_WIN:
@@ -999,6 +999,13 @@ static struct proto_ops llc_ui_ops = { 
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 =

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

static char llc_sock_err_msg[] __initdata =

        KERN_CRIT "LLC: Unable to register the network family\n";



static int __init llc2_init(void)

{

	int rc = proto_register(&llc_proto, 0);
@@ -1010,13 +1017,28 @@ static int __init llc2_init(void) 
	llc_station_init();

	llc_ui_sap_last_autoport = LLC_SAP_DYN_START;

	rc = llc_proc_init();

	if (rc != 0)

	if (rc != 0) {

		printk(llc_proc_err_msg);

		goto out_unregister_llc_proto;

	sock_register(&llc_ui_family_ops);

	}

	rc = llc_sysctl_init();

	if (rc) {

		printk(llc_sysctl_err_msg);

		goto out_proc;

	}

	rc = sock_register(&llc_ui_family_ops);

	if (rc) {

		printk(llc_sock_err_msg);

		goto out_sysctl;

	}

	llc_add_pack(LLC_DEST_SAP, llc_sap_handler);

	llc_add_pack(LLC_DEST_CONN, llc_conn_handler);

out:

	return rc;

out_sysctl:

	llc_sysctl_exit();

out_proc:

	llc_proc_exit();

out_unregister_llc_proto:

	proto_unregister(&llc_proto);

	goto out;
@@ -1029,6 +1051,7 @@ static void __exit llc2_exit(void) 
	llc_remove_pack(LLC_DEST_CONN);

	sock_unregister(PF_LLC);

	llc_proc_exit();

	llc_sysctl_exit();

	proto_unregister(&llc_proto);

}