Eleminate HZ from AX.25 kernel interfaces
PATCH 1/3 Eleminate HZ from AX.25 kernel interfaces
Convert all AX.25 sysctl time values from jiffies to ms as units.
Signed-off-by Ralf Baechle <[email protected]>
include/net/ax25.h | 10 +++--- net/ax25/af_ax25.c | 73 +++++++++++++++++++++++++-------------------- net/ax25/ax25_ds_timer.c | 3 + net/ax25/sysctl_net_ax25.c | 10 +++--- 4 files changed, 53 insertions(+), 43 deletions(-)
include/net/ax25.h +5 -5
@@ -138,14 +138,14 @@ enum {#define AX25_DEF_CONMODE 2/* Connected mode allowed */ #define AX25_DEF_WINDOW 2/* Window=2 */ #define AX25_DEF_EWINDOW 32/* Module-128 Window=32 */ -#define AX25_DEF_T1 (10 * HZ)/* T1=10s */ -#define AX25_DEF_T2 (3 * HZ)/* T2=3s */ -#define AX25_DEF_T3 (300 * HZ)/* T3=300s */ +#define AX25_DEF_T1 10000/* T1=10s */ +#define AX25_DEF_T2 3000/* T2=3s */ +#define AX25_DEF_T3 300000/* T3=300s */ #define AX25_DEF_N2 10/* N2=10 */ -#define AX25_DEF_IDLE (0 * 60 * HZ)/* Idle=None */ +#define AX25_DEF_IDLE 0/* Idle=None */ #define AX25_DEF_PACLEN 256/* Paclen=256 */ #define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX/* Standard AX.25 */ -#define AX25_DEF_DS_TIMEOUT (3 * 60 * HZ)/* DAMA timeout 3 minutes */ +#define AX25_DEF_DS_TIMEOUT 180000/* DAMA timeout 3 minutes */ typedef struct ax25_uid_assoc { struct ax25_uid_assoc *next;
net/ax25/af_ax25.c +41 -32
86 lines not on this page · raw message
net/ax25/ax25_ds_timer.c +2 -1
@@ -61,7 +61,8 @@ void ax25_ds_set_timer(ax25_dev *ax25_dereturn ;del_timer (&ax25_dev->dama.slave_timer); - ax25_dev->dama.slave_timeout = ax25_dev->values[AX25_VALUES_DS_TIMEOUT ] /10 ; + ax25_dev->dama.slave_timeout = +msecs_to_jiffies (ax25_dev->values[AX25_VALUES_DS_TIMEOUT ]) /10 ;ax25_ds_add_timer (ax25_dev); }
net/ax25/sysctl_net_ax25.c +5 -5
@@ -18,14 +18,14 @@ static int min_backoff[1], max_backoff[static int min_conmode[1 ], max_conmode[] = {2 };static int min_window[] = {1 }, max_window[] = {7 };static int min_ewindow[] = {1 }, max_ewindow[] = {63 }; -static int min_t1[] = {1 }, max_t1[] = {30 *HZ }; -static int min_t2[] = {1 }, max_t2[] = {20 *HZ }; -static int min_t3[1 ], max_t3[] = {3600 *HZ }; -static int min_idle[1 ], max_idle[] = {65535 *HZ }; +static int min_t1[] = {1 }, max_t1[] = {30000 }; +static int min_t2[] = {1 }, max_t2[] = {20000 }; +static int min_t3[1 ], max_t3[] = {3600000 }; +static int min_idle[1 ], max_idle[] = {65535000 };static int min_n2[] = {1 }, max_n2[] = {31 };static int min_paclen[] = {1 }, max_paclen[] = {512 };static int min_proto[1 ], max_proto[] = {3 }; -static int min_ds_timeout[1 ], max_ds_timeout[] = {65535 *HZ }; +static int min_ds_timeout[1 ], max_ds_timeout[] = {65535000 };static struct ctl_table_header *ax25_table_header;