Deleted Added
full compact
if_sf.c (267363) if_sf.c (270856)
1/*-
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 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
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 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
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/sf/if_sf.c 267363 2014-06-11 14:53:58Z jhb $");
34__FBSDID("$FreeBSD: head/sys/dev/sf/if_sf.c 270856 2014-08-30 19:55:54Z glebius $");
35
36/*
37 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
38 * Programming manual is available from:
39 * http://download.adaptec.com/pdfs/user_guides/aic6915_pg.pdf.
40 *
41 * Written by Bill Paul <wpaul@ctr.columbia.edu>
42 * Department of Electical Engineering

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

897#ifdef DEVICE_POLLING
898 ifp->if_capabilities |= IFCAP_POLLING;
899#endif
900 /*
901 * Tell the upper layer(s) we support long frames.
902 * Must appear after the call to ether_ifattach() because
903 * ether_ifattach() sets ifi_hdrlen to the default value.
904 */
35
36/*
37 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
38 * Programming manual is available from:
39 * http://download.adaptec.com/pdfs/user_guides/aic6915_pg.pdf.
40 *
41 * Written by Bill Paul <wpaul@ctr.columbia.edu>
42 * Department of Electical Engineering

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

897#ifdef DEVICE_POLLING
898 ifp->if_capabilities |= IFCAP_POLLING;
899#endif
900 /*
901 * Tell the upper layer(s) we support long frames.
902 * Must appear after the call to ether_ifattach() because
903 * ether_ifattach() sets ifi_hdrlen to the default value.
904 */
905 ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
905 ifp->if_hdrlen = sizeof(struct ether_vlan_header);
906
907 /* Hook interrupt last to avoid having to lock softc */
908 error = bus_setup_intr(dev, sc->sf_irq, INTR_TYPE_NET | INTR_MPSAFE,
909 NULL, sf_intr, sc, &sc->sf_intrhand);
910
911 if (error) {
912 device_printf(dev, "couldn't set up irq\n");
913 ether_ifdetach(ifp);

--- 1818 unchanged lines hidden ---
906
907 /* Hook interrupt last to avoid having to lock softc */
908 error = bus_setup_intr(dev, sc->sf_irq, INTR_TYPE_NET | INTR_MPSAFE,
909 NULL, sf_intr, sc, &sc->sf_intrhand);
910
911 if (error) {
912 device_printf(dev, "couldn't set up irq\n");
913 ether_ifdetach(ifp);

--- 1818 unchanged lines hidden ---