Deleted Added
full compact
ukphy_subr.c (213384) ukphy_subr.c (215297)
1/* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */
2
3/*-
4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */
2
3/*-
4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/mii/ukphy_subr.c 213384 2010-10-03 17:00:57Z marius $");
34__FBSDID("$FreeBSD: head/sys/dev/mii/ukphy_subr.c 215297 2010-11-14 13:26:10Z marius $");
35
36/*
37 * Subroutines shared by the ukphy driver and other PHY drivers.
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/socket.h>

--- 69 unchanged lines hidden (view full) ---

112 else if (anlpar & ANLPAR_TX)
113 mii->mii_media_active |= IFM_100_TX|IFM_HDX;
114 else if (anlpar & ANLPAR_10_FD)
115 mii->mii_media_active |= IFM_10_T|IFM_FDX;
116 else if (anlpar & ANLPAR_10)
117 mii->mii_media_active |= IFM_10_T|IFM_HDX;
118 else
119 mii->mii_media_active |= IFM_NONE;
35
36/*
37 * Subroutines shared by the ukphy driver and other PHY drivers.
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/socket.h>

--- 69 unchanged lines hidden (view full) ---

112 else if (anlpar & ANLPAR_TX)
113 mii->mii_media_active |= IFM_100_TX|IFM_HDX;
114 else if (anlpar & ANLPAR_10_FD)
115 mii->mii_media_active |= IFM_10_T|IFM_FDX;
116 else if (anlpar & ANLPAR_10)
117 mii->mii_media_active |= IFM_10_T|IFM_HDX;
118 else
119 mii->mii_media_active |= IFM_NONE;
120
121 if ((mii->mii_media_active & IFM_1000_T) != 0 &&
122 (gtsr & GTSR_MS_RES) != 0)
123 mii->mii_media_active |= IFM_ETH_MASTER;
124
125 if ((mii->mii_media_active & IFM_FDX) != 0)
126 mii->mii_media_active |= mii_phy_flowstatus(phy);
120 } else
121 mii->mii_media_active = ife->ifm_media;
122}
127 } else
128 mii->mii_media_active = ife->ifm_media;
129}