Deleted Added
full compact
if_fxp.c (38005) if_fxp.c (38007)
1/*
2 * Copyright (c) 1995, David Greenman
3 * All rights reserved.
4 *
5 * Modifications to support NetBSD and media selection:
6 * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
1/*
2 * Copyright (c) 1995, David Greenman
3 * All rights reserved.
4 *
5 * Modifications to support NetBSD and media selection:
6 * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * $Id: if_fxp.c,v 1.52 1998/04/17 22:37:03 des Exp $
30 * $Id: if_fxp.c,v 1.53 1998/08/02 00:28:45 dg Exp $
31 */
32
33/*
34 * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
35 */
36
37#include "bpfilter.h"
38

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

1443{
1444 struct fxp_softc *sc = ifp->if_softc;
1445 int flags;
1446
1447 switch (sc->phy_primary_device) {
1448 case FXP_PHY_DP83840:
1449 case FXP_PHY_DP83840A:
1450 case FXP_PHY_82555:
31 */
32
33/*
34 * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
35 */
36
37#include "bpfilter.h"
38

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

1443{
1444 struct fxp_softc *sc = ifp->if_softc;
1445 int flags;
1446
1447 switch (sc->phy_primary_device) {
1448 case FXP_PHY_DP83840:
1449 case FXP_PHY_DP83840A:
1450 case FXP_PHY_82555:
1451 case FXP_PHY_82555B:
1451 flags = fxp_mdi_read(sc, sc->phy_primary_addr, FXP_PHY_BMCR);
1452 ifmr->ifm_active = IFM_ETHER;
1453 if (flags & FXP_PHY_BMCR_AUTOEN)
1454 ifmr->ifm_active |= IFM_AUTO;
1455 else {
1456 if (flags & FXP_PHY_BMCR_SPEED_100M)
1457 ifmr->ifm_active |= IFM_100_TX;
1458 else

--- 304 unchanged lines hidden ---
1452 flags = fxp_mdi_read(sc, sc->phy_primary_addr, FXP_PHY_BMCR);
1453 ifmr->ifm_active = IFM_ETHER;
1454 if (flags & FXP_PHY_BMCR_AUTOEN)
1455 ifmr->ifm_active |= IFM_AUTO;
1456 else {
1457 if (flags & FXP_PHY_BMCR_SPEED_100M)
1458 ifmr->ifm_active |= IFM_100_TX;
1459 else

--- 304 unchanged lines hidden ---