diff options
| author | ae <ae@FreeBSD.org> | 2013-11-11 09:47:51 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2013-11-11 09:47:51 +0000 |
| commit | 95353ffa2c79a2baf43fdb4fdfcf17c984d8214e (patch) | |
| tree | 164eb32d3841fb979d04af0c6bb5c8a3f0d58508 /sys/net | |
| parent | 4f116e38229e29d70ca206ba622f8394dcf6278c (diff) | |
| download | FreeBSD-src-95353ffa2c79a2baf43fdb4fdfcf17c984d8214e.zip FreeBSD-src-95353ffa2c79a2baf43fdb4fdfcf17c984d8214e.tar.gz | |
MFC r256689:
Use the same actor key for media types of the same speed.
PR: 176097
MFC r256832:
Add a note that lacp_compose_key() should be updated, when new media
types will be added.
Submitted by: melifaro
Approved by: re (hrs)
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/ieee8023ad_lacp.c | 41 | ||||
| -rw-r--r-- | sys/net/if_media.h | 5 |
2 files changed, 43 insertions, 3 deletions
diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 014140b..8dbadd4 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1089,8 +1089,45 @@ lacp_compose_key(struct lacp_port *lp) KASSERT(IFM_TYPE(media) == IFM_ETHER, ("invalid media type")); KASSERT((media & IFM_FDX) != 0, ("aggregating HDX interface")); - /* bit 0..4: IFM_SUBTYPE */ - key = subtype; + /* bit 0..4: IFM_SUBTYPE modulo speed */ + switch (subtype) { + case IFM_10_T: + case IFM_10_2: + case IFM_10_5: + case IFM_10_STP: + case IFM_10_FL: + key = IFM_10_T; + break; + case IFM_100_TX: + case IFM_100_FX: + case IFM_100_T4: + case IFM_100_VG: + case IFM_100_T2: + key = IFM_100_TX; + break; + case IFM_1000_SX: + case IFM_1000_LX: + case IFM_1000_CX: + case IFM_1000_T: + key = IFM_1000_SX; + break; + case IFM_10G_LR: + case IFM_10G_SR: + case IFM_10G_CX4: + case IFM_10G_TWINAX: + case IFM_10G_TWINAX_LONG: + case IFM_10G_LRM: + case IFM_10G_T: + key = IFM_10G_LR; + break; + case IFM_40G_CR4: + case IFM_40G_SR4: + case IFM_40G_LR4: + key = IFM_40G_CR4; + break; + default: + key = subtype; + } /* bit 5..14: (some bits of) if_index of lagg device */ key |= 0x7fe0 & ((sc->sc_ifp->if_index) << 5); /* bit 15: 0 */ diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 7d26f7a..1bb5cc7 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -153,7 +153,10 @@ uint64_t ifmedia_baudrate(int); #define IFM_40G_CR4 27 /* 40GBase-CR4 */ #define IFM_40G_SR4 28 /* 40GBase-SR4 */ #define IFM_40G_LR4 29 /* 40GBase-LR4 */ - +/* + * Please update ieee8023ad_lacp.c:lacp_compose_key() + * after adding new Ethernet media types. + */ /* note 31 is the max! */ #define IFM_ETH_MASTER 0x00000100 /* master mode (1000baseT) */ |
