svn commit: r282036 - in projects/ifnet/sys: dev/alc dev/bge dev/msk dev/re dev/rl dev/xl net
Gleb Smirnoff
glebius at FreeBSD.org
Sun Apr 26 21:09:08 UTC 2015
Author: glebius
Date: Sun Apr 26 21:09:05 2015
New Revision: 282036
URL: https://svnweb.freebsd.org/changeset/base/282036
Log:
Since IFM_ACTIVE clashes with IFM_NONE, we can't mix mii_media_status and
mii_media_active.
Modified:
projects/ifnet/sys/dev/alc/if_alc.c
projects/ifnet/sys/dev/bge/if_bge.c
projects/ifnet/sys/dev/msk/if_msk.c
projects/ifnet/sys/dev/re/if_re.c
projects/ifnet/sys/dev/rl/if_rl.c
projects/ifnet/sys/dev/xl/if_xl.c
projects/ifnet/sys/net/if.h
projects/ifnet/sys/net/if_media.c
Modified: projects/ifnet/sys/dev/alc/if_alc.c
==============================================================================
--- projects/ifnet/sys/dev/alc/if_alc.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/alc/if_alc.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -442,8 +442,8 @@ alc_miibus_statchg(device_t dev)
alc_aspm(sc, 0, IFM_SUBTYPE(mii->mii_media_active));
alc_dsp_fixup(sc, IFM_SUBTYPE(mii->mii_media_active));
if (sc->alc_ifp != NULL)
- if_media_status(sc->alc_ifp,
- mii->mii_media_active | mii->mii_media_status);
+ if_media_status(sc->alc_ifp, mii->mii_media_active,
+ mii->mii_media_status);
}
static uint32_t
Modified: projects/ifnet/sys/dev/bge/if_bge.c
==============================================================================
--- projects/ifnet/sys/dev/bge/if_bge.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/bge/if_bge.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -1291,8 +1291,8 @@ bge_miibus_statchg(device_t dev)
sc->bge_link = 0;
if (sc->bge_ifp != NULL)
- if_media_status(sc->bge_ifp,
- mii->mii_media_active | mii->mii_media_status);
+ if_media_status(sc->bge_ifp, mii->mii_media_active,
+ mii->mii_media_status);
if (sc->bge_link == 0)
return;
Modified: projects/ifnet/sys/dev/msk/if_msk.c
==============================================================================
--- projects/ifnet/sys/dev/msk/if_msk.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/msk/if_msk.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -580,7 +580,7 @@ msk_miibus_statchg(device_t dev)
GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL);
}
}
- if_media_status(ifp, mii->mii_media_active | mii->mii_media_status);
+ if_media_status(ifp, mii->mii_media_active, mii->mii_media_status);
}
static void
Modified: projects/ifnet/sys/dev/re/if_re.c
==============================================================================
--- projects/ifnet/sys/dev/re/if_re.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/re/if_re.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -644,7 +644,7 @@ re_miibus_statchg(device_t dev)
}
}
- if_media_status(ifp, mii->mii_media_active | mii->mii_media_status);
+ if_media_status(ifp, mii->mii_media_active, mii->mii_media_status);
/*
* RealTek controllers does not provide any interface to
Modified: projects/ifnet/sys/dev/rl/if_rl.c
==============================================================================
--- projects/ifnet/sys/dev/rl/if_rl.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/rl/if_rl.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -514,7 +514,7 @@ rl_miibus_statchg(device_t dev)
* Tx/Rx MACs for resolved speed, duplex and flow-control
* parameters.
*/
- if_media_status(ifp, mii->mii_media_active | mii->mii_media_status);
+ if_media_status(ifp, mii->mii_media_active, mii->mii_media_status);
}
/*
Modified: projects/ifnet/sys/dev/xl/if_xl.c
==============================================================================
--- projects/ifnet/sys/dev/xl/if_xl.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/dev/xl/if_xl.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -477,8 +477,8 @@ xl_miibus_statchg(device_t dev)
}
CSR_WRITE_1(sc, XL_W3_MAC_CTRL, macctl);
if (sc->xl_ifp != NULL)
- if_media_status(sc->xl_ifp,
- mii->mii_media_active | mii->mii_media_status);
+ if_media_status(sc->xl_ifp, mii->mii_media_active,
+ mii->mii_media_status);
}
/*
Modified: projects/ifnet/sys/net/if.h
==============================================================================
--- projects/ifnet/sys/net/if.h Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/net/if.h Sun Apr 26 21:09:05 2015 (r282036)
@@ -747,7 +747,7 @@ uint64_t if_get_counter_default(if_t, if
/*
* Interface media manipulation by drivers.
*/
-void if_media_status(if_t, if_media_t);
+void if_media_status(if_t, if_media_t, if_media_t);
void if_media_change(if_t, if_media_t *, if_media_t);
/*
Modified: projects/ifnet/sys/net/if_media.c
==============================================================================
--- projects/ifnet/sys/net/if_media.c Sun Apr 26 17:57:28 2015 (r282035)
+++ projects/ifnet/sys/net/if_media.c Sun Apr 26 21:09:05 2015 (r282036)
@@ -217,11 +217,11 @@ ifmedia_ioctl(struct ifnet *ifp, struct
* upcall should come only in case if media is set to autonegotiation.
*/
void
-if_media_status(struct ifnet *ifp, if_media_t media)
+if_media_status(struct ifnet *ifp, if_media_t media, if_media_t status)
{
if_setbaudrate(ifp, ifmedia_baudrate(media));
- if_link_state_change(ifp, ifmedia_link_state(media));
+ if_link_state_change(ifp, ifmedia_link_state(status));
}
/*
More information about the svn-src-projects
mailing list