diff options
author | Andrew Thompson <thompsa@FreeBSD.org> | 2005-10-14 10:38:12 +0000 |
---|---|---|
committer | Andrew Thompson <thompsa@FreeBSD.org> | 2005-10-14 10:38:12 +0000 |
commit | 6b32f3d3f23ee7d5e3bff9b2a316b993560c6ea2 (patch) | |
tree | 2334e7afcd0abef8b1db93ebcde06eba9e43b7f8 /sys/net/bridgestp.c | |
parent | 106e9401dbdb8f00e57a86b33b4261bb5d4baf3a (diff) | |
download | src-6b32f3d3f23ee7d5e3bff9b2a316b993560c6ea2.tar.gz src-6b32f3d3f23ee7d5e3bff9b2a316b993560c6ea2.zip |
Change most of the bridge and stp funtions to static. This has highlighted
that the following funtions are not used, wrap in '#ifdef noused' for the
moment.
bstp_enable_change_detection
bstp_disable_change_detection
bstp_set_bridge_priority
bstp_set_port_priority
bstp_set_path_cost
Notes
Notes:
svn path=/head/; revision=151313
Diffstat (limited to 'sys/net/bridgestp.c')
-rw-r--r-- | sys/net/bridgestp.c | 211 |
1 files changed, 112 insertions, 99 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 1c4884252f43..7dec2b2e4fc6 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -121,64 +121,75 @@ struct bstp_tbpdu { const uint8_t bstp_etheraddr[] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; -void bstp_initialize_port(struct bridge_softc *, struct bridge_iflist *); -void bstp_ifupdstatus(struct bridge_softc *, struct bridge_iflist *); -void bstp_enable_port(struct bridge_softc *, struct bridge_iflist *); -void bstp_disable_port(struct bridge_softc *, struct bridge_iflist *); -void bstp_enable_change_detection(struct bridge_iflist *); -void bstp_disable_change_detection(struct bridge_iflist *); -int bstp_root_bridge(struct bridge_softc *sc); -int bstp_supersedes_port_info(struct bridge_softc *, - struct bridge_iflist *, struct bstp_config_unit *); -int bstp_designated_port(struct bridge_softc *, struct bridge_iflist *); -int bstp_designated_for_some_port(struct bridge_softc *); -void bstp_transmit_config(struct bridge_softc *, struct bridge_iflist *); -void bstp_transmit_tcn(struct bridge_softc *); -void bstp_received_config_bpdu(struct bridge_softc *, - struct bridge_iflist *, struct bstp_config_unit *); -void bstp_received_tcn_bpdu(struct bridge_softc *, struct bridge_iflist *, - struct bstp_tcn_unit *); -void bstp_record_config_information(struct bridge_softc *, - struct bridge_iflist *, struct bstp_config_unit *); -void bstp_record_config_timeout_values(struct bridge_softc *, - struct bstp_config_unit *); -void bstp_config_bpdu_generation(struct bridge_softc *); -void bstp_send_config_bpdu(struct bridge_softc *, struct bridge_iflist *, - struct bstp_config_unit *); -void bstp_configuration_update(struct bridge_softc *); -void bstp_root_selection(struct bridge_softc *); -void bstp_designated_port_selection(struct bridge_softc *); -void bstp_become_designated_port(struct bridge_softc *, - struct bridge_iflist *); -void bstp_port_state_selection(struct bridge_softc *); -void bstp_make_forwarding(struct bridge_softc *, struct bridge_iflist *); -void bstp_make_blocking(struct bridge_softc *, struct bridge_iflist *); -void bstp_set_port_state(struct bridge_iflist *, uint8_t); -void bstp_set_bridge_priority(struct bridge_softc *, uint64_t); -void bstp_set_port_priority(struct bridge_softc *, struct bridge_iflist *, - uint16_t); -void bstp_set_path_cost(struct bridge_softc *, struct bridge_iflist *, - uint32_t); -void bstp_topology_change_detection(struct bridge_softc *); -void bstp_topology_change_acknowledged(struct bridge_softc *); -void bstp_acknowledge_topology_change(struct bridge_softc *, - struct bridge_iflist *); - -void bstp_tick(void *); -void bstp_timer_start(struct bridge_timer *, uint16_t); -void bstp_timer_stop(struct bridge_timer *); -int bstp_timer_expired(struct bridge_timer *, uint16_t); - -void bstp_hold_timer_expiry(struct bridge_softc *, struct bridge_iflist *); -void bstp_message_age_timer_expiry(struct bridge_softc *, - struct bridge_iflist *); -void bstp_forward_delay_timer_expiry(struct bridge_softc *, - struct bridge_iflist *); -void bstp_topology_change_timer_expiry(struct bridge_softc *); -void bstp_tcn_timer_expiry(struct bridge_softc *); -void bstp_hello_timer_expiry(struct bridge_softc *); - -void +static void bstp_initialize_port(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_ifupdstatus(struct bridge_softc *, struct bridge_iflist *); +static void bstp_enable_port(struct bridge_softc *, struct bridge_iflist *); +static void bstp_disable_port(struct bridge_softc *, + struct bridge_iflist *); +#ifdef notused +static void bstp_enable_change_detection(struct bridge_iflist *); +static void bstp_disable_change_detection(struct bridge_iflist *); +#endif /* notused */ +static int bstp_root_bridge(struct bridge_softc *sc); +static int bstp_supersedes_port_info(struct bridge_softc *, + struct bridge_iflist *, struct bstp_config_unit *); +static int bstp_designated_port(struct bridge_softc *, + struct bridge_iflist *); +static int bstp_designated_for_some_port(struct bridge_softc *); +static void bstp_transmit_config(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_transmit_tcn(struct bridge_softc *); +static void bstp_received_config_bpdu(struct bridge_softc *, + struct bridge_iflist *, struct bstp_config_unit *); +static void bstp_received_tcn_bpdu(struct bridge_softc *, + struct bridge_iflist *, struct bstp_tcn_unit *); +static void bstp_record_config_information(struct bridge_softc *, + struct bridge_iflist *, struct bstp_config_unit *); +static void bstp_record_config_timeout_values(struct bridge_softc *, + struct bstp_config_unit *); +static void bstp_config_bpdu_generation(struct bridge_softc *); +static void bstp_send_config_bpdu(struct bridge_softc *, + struct bridge_iflist *, struct bstp_config_unit *); +static void bstp_configuration_update(struct bridge_softc *); +static void bstp_root_selection(struct bridge_softc *); +static void bstp_designated_port_selection(struct bridge_softc *); +static void bstp_become_designated_port(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_port_state_selection(struct bridge_softc *); +static void bstp_make_forwarding(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_make_blocking(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_set_port_state(struct bridge_iflist *, uint8_t); +#ifdef notused +static void bstp_set_bridge_priority(struct bridge_softc *, uint64_t); +static void bstp_set_port_priority(struct bridge_softc *, + struct bridge_iflist *, uint16_t); +static void bstp_set_path_cost(struct bridge_softc *, + struct bridge_iflist *, uint32_t); +#endif /* notused */ +static void bstp_topology_change_detection(struct bridge_softc *); +static void bstp_topology_change_acknowledged(struct bridge_softc *); +static void bstp_acknowledge_topology_change(struct bridge_softc *, + struct bridge_iflist *); + +static void bstp_tick(void *); +static void bstp_timer_start(struct bridge_timer *, uint16_t); +static void bstp_timer_stop(struct bridge_timer *); +static int bstp_timer_expired(struct bridge_timer *, uint16_t); + +static void bstp_hold_timer_expiry(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_message_age_timer_expiry(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_forward_delay_timer_expiry(struct bridge_softc *, + struct bridge_iflist *); +static void bstp_topology_change_timer_expiry(struct bridge_softc *); +static void bstp_tcn_timer_expiry(struct bridge_softc *); +static void bstp_hello_timer_expiry(struct bridge_softc *); + +static void bstp_transmit_config(struct bridge_softc *sc, struct bridge_iflist *bif) { if (bif->bif_hold_timer.active) { @@ -214,7 +225,7 @@ bstp_transmit_config(struct bridge_softc *sc, struct bridge_iflist *bif) } } -void +static void bstp_send_config_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, struct bstp_config_unit *cu) { @@ -284,13 +295,13 @@ bstp_send_config_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, BRIDGE_LOCK(sc); } -int +static int bstp_root_bridge(struct bridge_softc *sc) { return (sc->sc_designated_root == sc->sc_bridge_id); } -int +static int bstp_supersedes_port_info(struct bridge_softc *sc, struct bridge_iflist *bif, struct bstp_config_unit *cu) { @@ -316,7 +327,7 @@ bstp_supersedes_port_info(struct bridge_softc *sc, struct bridge_iflist *bif, return (0); } -void +static void bstp_record_config_information(struct bridge_softc *sc, struct bridge_iflist *bif, struct bstp_config_unit *cu) { @@ -327,7 +338,7 @@ bstp_record_config_information(struct bridge_softc *sc, bstp_timer_start(&bif->bif_message_age_timer, cu->cu_message_age); } -void +static void bstp_record_config_timeout_values(struct bridge_softc *sc, struct bstp_config_unit *config) { @@ -337,7 +348,7 @@ bstp_record_config_timeout_values(struct bridge_softc *sc, sc->sc_topology_change = config->cu_topology_change; } -void +static void bstp_config_bpdu_generation(struct bridge_softc *sc) { struct bridge_iflist *bif; @@ -351,14 +362,14 @@ bstp_config_bpdu_generation(struct bridge_softc *sc) } } -int +static int bstp_designated_port(struct bridge_softc *sc, struct bridge_iflist *bif) { return ((bif->bif_designated_bridge == sc->sc_bridge_id) && (bif->bif_designated_port == bif->bif_port_id)); } -void +static void bstp_transmit_tcn(struct bridge_softc *sc) { struct bstp_tbpdu bpdu; @@ -400,7 +411,7 @@ bstp_transmit_tcn(struct bridge_softc *sc) BRIDGE_LOCK(sc); } -void +static void bstp_configuration_update(struct bridge_softc *sc) { BRIDGE_LOCK_ASSERT(sc); @@ -409,7 +420,7 @@ bstp_configuration_update(struct bridge_softc *sc) bstp_designated_port_selection(sc); } -void +static void bstp_root_selection(struct bridge_softc *sc) { struct bridge_iflist *root_port = NULL, *bif; @@ -469,7 +480,7 @@ set_port: } } -void +static void bstp_designated_port_selection(struct bridge_softc *sc) { struct bridge_iflist *bif; @@ -501,7 +512,7 @@ designated: } } -void +static void bstp_become_designated_port(struct bridge_softc *sc, struct bridge_iflist *bif) { bif->bif_designated_root = sc->sc_designated_root; @@ -510,7 +521,7 @@ bstp_become_designated_port(struct bridge_softc *sc, struct bridge_iflist *bif) bif->bif_designated_port = bif->bif_port_id; } -void +static void bstp_port_state_selection(struct bridge_softc *sc) { struct bridge_iflist *bif; @@ -533,7 +544,7 @@ bstp_port_state_selection(struct bridge_softc *sc) } } -void +static void bstp_make_forwarding(struct bridge_softc *sc, struct bridge_iflist *bif) { if (bif->bif_state == BSTP_IFSTATE_BLOCKING) { @@ -542,7 +553,7 @@ bstp_make_forwarding(struct bridge_softc *sc, struct bridge_iflist *bif) } } -void +static void bstp_make_blocking(struct bridge_softc *sc, struct bridge_iflist *bif) { BRIDGE_LOCK_ASSERT(sc); @@ -561,13 +572,13 @@ bstp_make_blocking(struct bridge_softc *sc, struct bridge_iflist *bif) } } -void +static void bstp_set_port_state(struct bridge_iflist *bif, uint8_t state) { bif->bif_state = state; } -void +static void bstp_topology_change_detection(struct bridge_softc *sc) { if (bstp_root_bridge(sc)) { @@ -580,14 +591,14 @@ bstp_topology_change_detection(struct bridge_softc *sc) sc->sc_topology_change_detected = 1; } -void +static void bstp_topology_change_acknowledged(struct bridge_softc *sc) { sc->sc_topology_change_detected = 0; bstp_timer_stop(&sc->sc_tcn_timer); } -void +static void bstp_acknowledge_topology_change(struct bridge_softc *sc, struct bridge_iflist *bif) { @@ -693,7 +704,7 @@ bstp_input(struct ifnet *ifp, struct mbuf *m) return (NULL); } -void +static void bstp_received_config_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, struct bstp_config_unit *cu) { @@ -732,7 +743,7 @@ bstp_received_config_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, } } -void +static void bstp_received_tcn_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, struct bstp_tcn_unit *tcn) { @@ -743,14 +754,14 @@ bstp_received_tcn_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif, } } -void +static void bstp_hello_timer_expiry(struct bridge_softc *sc) { bstp_config_bpdu_generation(sc); bstp_timer_start(&sc->sc_hello_timer, 0); } -void +static void bstp_message_age_timer_expiry(struct bridge_softc *sc, struct bridge_iflist *bif) { @@ -773,7 +784,7 @@ bstp_message_age_timer_expiry(struct bridge_softc *sc, } } -void +static void bstp_forward_delay_timer_expiry(struct bridge_softc *sc, struct bridge_iflist *bif) { @@ -788,7 +799,7 @@ bstp_forward_delay_timer_expiry(struct bridge_softc *sc, } } -int +static int bstp_designated_for_some_port(struct bridge_softc *sc) { @@ -803,21 +814,21 @@ bstp_designated_for_some_port(struct bridge_softc *sc) return (0); } -void +static void bstp_tcn_timer_expiry(struct bridge_softc *sc) { bstp_transmit_tcn(sc); bstp_timer_start(&sc->sc_tcn_timer, 0); } -void +static void bstp_topology_change_timer_expiry(struct bridge_softc *sc) { sc->sc_topology_change_detected = 0; sc->sc_topology_change = 0; } -void +static void bstp_hold_timer_expiry(struct bridge_softc *sc, struct bridge_iflist *bif) { if (bif->bif_config_pending) @@ -914,7 +925,7 @@ bstp_stop(struct bridge_softc *sc) } -void +static void bstp_initialize_port(struct bridge_softc *sc, struct bridge_iflist *bif) { bstp_become_designated_port(sc, bif); @@ -927,14 +938,14 @@ bstp_initialize_port(struct bridge_softc *sc, struct bridge_iflist *bif) bstp_timer_stop(&bif->bif_hold_timer); } -void +static void bstp_enable_port(struct bridge_softc *sc, struct bridge_iflist *bif) { bstp_initialize_port(sc, bif); bstp_port_state_selection(sc); } -void +static void bstp_disable_port(struct bridge_softc *sc, struct bridge_iflist *bif) { int root; @@ -964,7 +975,8 @@ bstp_disable_port(struct bridge_softc *sc, struct bridge_iflist *bif) } } -void +#ifdef notused +static void bstp_set_bridge_priority(struct bridge_softc *sc, uint64_t new_bridge_id) { struct bridge_iflist *bif; @@ -998,7 +1010,7 @@ bstp_set_bridge_priority(struct bridge_softc *sc, uint64_t new_bridge_id) } } -void +static void bstp_set_port_priority(struct bridge_softc *sc, struct bridge_iflist *bif, uint16_t new_port_id) { @@ -1014,7 +1026,7 @@ bstp_set_port_priority(struct bridge_softc *sc, struct bridge_iflist *bif, } } -void +static void bstp_set_path_cost(struct bridge_softc *sc, struct bridge_iflist *bif, uint32_t path_cost) { @@ -1023,17 +1035,18 @@ bstp_set_path_cost(struct bridge_softc *sc, struct bridge_iflist *bif, bstp_port_state_selection(sc); } -void +static void bstp_enable_change_detection(struct bridge_iflist *bif) { bif->bif_change_detection_enabled = 1; } -void +static void bstp_disable_change_detection(struct bridge_iflist *bif) { bif->bif_change_detection_enabled = 0; } +#endif /* notused */ void bstp_linkstate(struct ifnet *ifp, int state) @@ -1057,7 +1070,7 @@ bstp_linkstate(struct ifnet *ifp, int state) BRIDGE_UNLOCK(sc); } -void +static void bstp_ifupdstatus(struct bridge_softc *sc, struct bridge_iflist *bif) { struct ifnet *ifp = bif->bif_ifp; @@ -1085,7 +1098,7 @@ bstp_ifupdstatus(struct bridge_softc *sc, struct bridge_iflist *bif) bstp_disable_port(sc, bif); } -void +static void bstp_tick(void *arg) { struct bridge_softc *sc = arg; @@ -1142,21 +1155,21 @@ bstp_tick(void *arg) callout_reset(&sc->sc_bstpcallout, hz, bstp_tick, sc); } -void +static void bstp_timer_start(struct bridge_timer *t, uint16_t v) { t->value = v; t->active = 1; } -void +static void bstp_timer_stop(struct bridge_timer *t) { t->value = 0; t->active = 0; } -int +static int bstp_timer_expired(struct bridge_timer *t, uint16_t v) { if (t->active == 0) |