From 9019b2a5508feb26f7c9ac941333e6b36f9cbdf7 Mon Sep 17 00:00:00 2001 From: yamt Date: Wed, 1 Jun 2005 13:34:48 +0000 Subject: [PATCH] make lacp_timer_funcs static. --- sys/net/agr/ieee8023ad_lacp_impl.h | 5 +---- sys/net/agr/ieee8023ad_lacp_timer.c | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/net/agr/ieee8023ad_lacp_impl.h b/sys/net/agr/ieee8023ad_lacp_impl.h index b54df7d47f93..4014e10022f8 100644 --- a/sys/net/agr/ieee8023ad_lacp_impl.h +++ b/sys/net/agr/ieee8023ad_lacp_impl.h @@ -1,4 +1,4 @@ -/* $NetBSD: ieee8023ad_lacp_impl.h,v 1.1 2005/03/18 11:11:50 yamt Exp $ */ +/* $NetBSD: ieee8023ad_lacp_impl.h,v 1.2 2005/06/01 13:34:48 yamt Exp $ */ /*- * Copyright (c)2005 YAMAMOTO Takashi, @@ -99,9 +99,6 @@ struct lacp_port { #define LACPPORT_NTT 1 /* need to transmit */ -typedef void (*lacp_timer_func_t)(struct lacp_port *); -const lacp_timer_func_t lacp_timer_funcs[LACP_NTIMER]; - #define LACP_SOFTC(sc) \ (&IEEE8023AD_SOFTC(sc)->isc_lacpsc) #define LACP_PORT(port) \ diff --git a/sys/net/agr/ieee8023ad_lacp_timer.c b/sys/net/agr/ieee8023ad_lacp_timer.c index 6459ae725602..ba74502b2826 100644 --- a/sys/net/agr/ieee8023ad_lacp_timer.c +++ b/sys/net/agr/ieee8023ad_lacp_timer.c @@ -1,4 +1,4 @@ -/* $NetBSD: ieee8023ad_lacp_timer.c,v 1.1 2005/03/18 11:11:50 yamt Exp $ */ +/* $NetBSD: ieee8023ad_lacp_timer.c,v 1.2 2005/06/01 13:34:48 yamt Exp $ */ /*- * Copyright (c)2005 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_timer.c,v 1.1 2005/03/18 11:11:50 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_timer.c,v 1.2 2005/06/01 13:34:48 yamt Exp $"); #include #include @@ -41,7 +41,9 @@ __KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp_timer.c,v 1.1 2005/03/18 11:11:50 ya #include #include -const lacp_timer_func_t lacp_timer_funcs[LACP_NTIMER] = { +typedef void (*lacp_timer_func_t)(struct lacp_port *); + +const static lacp_timer_func_t lacp_timer_funcs[LACP_NTIMER] = { [LACP_TIMER_CURRENT_WHILE] = lacp_sm_rx_timer, [LACP_TIMER_PERIODIC] = lacp_sm_ptx_timer, [LACP_TIMER_WAIT_WHILE] = lacp_sm_mux_timer,