diff options
author | thompsa <thompsa@FreeBSD.org> | 2007-06-12 07:29:11 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2007-06-12 07:29:11 +0000 |
commit | 60f4b707fe5fac27f8dae57235d92f743aada286 (patch) | |
tree | cc1d42fdbfb92e5c9963aa6326f1b2ab50b6dc18 /sys/net/ieee8023ad_lacp.h | |
parent | 49712c9a601c8ab93eac4b8f8cc221c287a68719 (diff) | |
download | FreeBSD-src-60f4b707fe5fac27f8dae57235d92f743aada286.zip FreeBSD-src-60f4b707fe5fac27f8dae57235d92f743aada286.tar.gz |
non-functional cleanup
- remove dead code
- use consistent variable names
- gc unused defines
- whitespace cleanup
Diffstat (limited to 'sys/net/ieee8023ad_lacp.h')
-rw-r--r-- | sys/net/ieee8023ad_lacp.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index 7673b09..cb5f836 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -61,13 +61,8 @@ #define LACP_STATE_DEFAULTED (1<<6) #define LACP_STATE_EXPIRED (1<<7) -#define LACP_PORT_NTT 0x00000001 -#define LACP_PORT_MARK 0x00000002 -#define LACP_PORT_PROMISC 0x00000004 -#define LACP_PORT_LADDRCHANGED 0x00000008 -#define LACP_PORT_ATTACHED 0x00000010 -#define LACP_PORT_LARVAL 0x00000020 -#define LACP_PORT_DETACHING 0x00000040 +#define LACP_PORT_NTT 0x00000001 +#define LACP_PORT_MARK 0x00000002 #define LACP_STATE_BITS \ "\020" \ @@ -132,9 +127,9 @@ struct lacp_portid { } __packed; struct lacp_peerinfo { - struct lacp_systemid lip_systemid; + struct lacp_systemid lip_systemid; uint16_t lip_key; - struct lacp_portid lip_portid; + struct lacp_portid lip_portid; uint8_t lip_state; uint8_t lip_resv[3]; } __packed; @@ -228,11 +223,11 @@ struct lacp_aggregator { TAILQ_HEAD(, lacp_port) la_ports; /* distributing ports */ struct lacp_peerinfo la_partner; struct lacp_peerinfo la_actor; - int la_pending; /* number of ports which is waiting wait_while */ + int la_pending; /* number of ports in wait_while */ }; struct lacp_softc { - struct lagg_softc *lsc_lagg; + struct lagg_softc *lsc_softc; struct lacp_aggregator *lsc_active_aggregator; TAILQ_HEAD(, lacp_aggregator) lsc_aggregators; boolean_t lsc_suppress_distributing; @@ -257,11 +252,6 @@ struct lacp_softc { #define LACP_AGGREGATE_WAIT_TIME (2) #define LACP_TRANSIT_DELAY 3000 /* in msec */ -/* -int tlv_check(const void *, size_t, const struct tlvhdr *, - const struct tlv_template *, boolean_t); -*/ - #define LACP_STATE_EQ(s1, s2, mask) \ ((((s1) ^ (s2)) & (mask)) == 0) |