Deleted Added
full compact
if_fxp.c (213844) if_fxp.c (213893)
1/*-
2 * Copyright (c) 1995, David Greenman
3 * Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1995, David Greenman
3 * Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/fxp/if_fxp.c 213844 2010-10-14 18:31:40Z yongari $");
31__FBSDID("$FreeBSD: head/sys/dev/fxp/if_fxp.c 213893 2010-10-15 14:52:11Z marius $");
32
33/*
34 * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
35 */
36
37#ifdef HAVE_KERNEL_OPTION_HEADERS
38#include "opt_device_polling.h"
39#endif

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

799 * doesn't have a programming interface of any sort. The
800 * media is sensed automatically based on how the link partner
801 * is configured. This is, in essence, manual configuration.
802 */
803 if (sc->flags & FXP_FLAG_SERIAL_MEDIA) {
804 ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
805 ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_MANUAL);
806 } else {
32
33/*
34 * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
35 */
36
37#ifdef HAVE_KERNEL_OPTION_HEADERS
38#include "opt_device_polling.h"
39#endif

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

799 * doesn't have a programming interface of any sort. The
800 * media is sensed automatically based on how the link partner
801 * is configured. This is, in essence, manual configuration.
802 */
803 if (sc->flags & FXP_FLAG_SERIAL_MEDIA) {
804 ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
805 ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_MANUAL);
806 } else {
807 if (mii_phy_probe(dev, &sc->miibus, fxp_ifmedia_upd,
808 fxp_ifmedia_sts)) {
809 device_printf(dev, "MII without any PHY!\n");
810 error = ENXIO;
807 /*
808 * i82557 wedge when isolating all of their PHYs.
809 */
810 error = mii_attach(dev, &sc->miibus, ifp, fxp_ifmedia_upd,
811 fxp_ifmedia_sts, BMSR_DEFCAPMASK, MII_PHY_ANY,
812 MII_OFFSET_ANY, MIIF_NOISOLATE);
813 if (error != 0) {
814 device_printf(dev, "attaching PHYs failed\n");
811 goto fail;
812 }
813 }
814
815 if_initname(ifp, device_get_name(dev), device_get_unit(dev));
816 ifp->if_init = fxp_init;
817 ifp->if_softc = sc;
818 ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;

--- 2356 unchanged lines hidden ---
815 goto fail;
816 }
817 }
818
819 if_initname(ifp, device_get_name(dev), device_get_unit(dev));
820 ifp->if_init = fxp_init;
821 ifp->if_softc = sc;
822 ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;

--- 2356 unchanged lines hidden ---