Author: arybchik
Date: Fri May 29 05:58:21 2015
New Revision: 283682
URL: https://svnweb.freebsd.org/changeset/base/283682
Log:
MFC: r283599
sfxge: mask ifmedia options (pauses) when looking for matching mode
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/sfxge_port.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/sfxge_port.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_port.c Fri May 29 05:50:33 2015
(r283681)
+++ stable/10/sys/dev/sfxge/sfxge_port.c Fri May 29 05:58:21 2015
(r283682)
@@ -710,6 +710,8 @@ sfxge_link_mode_to_phy_cap(efx_link_mode
static int
sfxge_phy_cap_mask(struct sfxge_softc *sc, int ifmedia, uint32_t *phy_cap_mask)
{
+ /* Get global options (duplex), type and subtype bits */
+ int ifmedia_masked = ifmedia & (IFM_GMASK | IFM_NMASK | IFM_TMASK);
efx_phy_media_type_t medium_type;
boolean_t mode_found = B_FALSE;
uint32_t cap_mask, mode_cap_mask;
@@ -725,7 +727,7 @@ sfxge_phy_cap_mask(struct sfxge_softc *s
efx_phy_adv_cap_get(sc->enp, EFX_PHY_CAP_PERM, &cap_mask);
for (mode = EFX_LINK_10HDX; mode < EFX_LINK_NMODES; mode++) {
- if (ifmedia == sfxge_link_mode[medium_type][mode]) {
+ if (ifmedia_masked == sfxge_link_mode[medium_type][mode]) {
mode_found = B_TRUE;
break;
}
@@ -736,8 +738,8 @@ sfxge_phy_cap_mask(struct sfxge_softc *s
* If media is not in the table, it must be IFM_AUTO.
*/
KASSERT((cap_mask & (1 << EFX_PHY_CAP_AN)) &&
- ifmedia == (IFM_ETHER | IFM_AUTO),
- ("%s: no mode for media %d", __func__, ifmedia));
+ ifmedia_masked == (IFM_ETHER | IFM_AUTO),
+ ("%s: no mode for media %#x", __func__, ifmedia));
*phy_cap_mask = (cap_mask & ~(1 << EFX_PHY_CAP_ASYM));
return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
