Deleted Added
full compact
if_sk.c (106936) if_sk.c (109623)
1/*
2 * Copyright (c) 1997, 1998, 1999, 2000
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 *
1/*
2 * Copyright (c) 1997, 1998, 1999, 2000
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 * $FreeBSD: head/sys/dev/sk/if_sk.c 106936 2002-11-14 23:49:09Z sam $
32 * $FreeBSD: head/sys/dev/sk/if_sk.c 109623 2003-01-21 08:56:16Z alfred $
33 */
34
35/*
36 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
37 * the SK-984x series adapters, both single port and dual port.
38 * References:
39 * The XaQti XMAC II datasheet,
40 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf

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

108
109MODULE_DEPEND(sk, miibus, 1, 1, 1);
110
111/* "controller miibus0" required. See GENERIC if you get errors here. */
112#include "miibus_if.h"
113
114#ifndef lint
115static const char rcsid[] =
33 */
34
35/*
36 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
37 * the SK-984x series adapters, both single port and dual port.
38 * References:
39 * The XaQti XMAC II datasheet,
40 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf

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

108
109MODULE_DEPEND(sk, miibus, 1, 1, 1);
110
111/* "controller miibus0" required. See GENERIC if you get errors here. */
112#include "miibus_if.h"
113
114#ifndef lint
115static const char rcsid[] =
116 "$FreeBSD: head/sys/dev/sk/if_sk.c 106936 2002-11-14 23:49:09Z sam $";
116 "$FreeBSD: head/sys/dev/sk/if_sk.c 109623 2003-01-21 08:56:16Z alfred $";
117#endif
118
119static struct sk_type sk_devs[] = {
120 { SK_VENDORID, SK_DEVICEID_GE, "SysKonnect Gigabit Ethernet" },
121 { 0, 0, NULL }
122};
123
124static int sk_probe (device_t);

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

683 struct mbuf *m;
684{
685 struct mbuf *m_new = NULL;
686 struct sk_rx_desc *r;
687
688 if (m == NULL) {
689 caddr_t *buf = NULL;
690
117#endif
118
119static struct sk_type sk_devs[] = {
120 { SK_VENDORID, SK_DEVICEID_GE, "SysKonnect Gigabit Ethernet" },
121 { 0, 0, NULL }
122};
123
124static int sk_probe (device_t);

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

683 struct mbuf *m;
684{
685 struct mbuf *m_new = NULL;
686 struct sk_rx_desc *r;
687
688 if (m == NULL) {
689 caddr_t *buf = NULL;
690
691 MGETHDR(m_new, M_DONTWAIT, MT_DATA);
691 MGETHDR(m_new, M_NOWAIT, MT_DATA);
692 if (m_new == NULL)
693 return(ENOBUFS);
694
695 /* Allocate the jumbo buffer */
696 buf = sk_jalloc(sc_if);
697 if (buf == NULL) {
698 m_freem(m_new);
699#ifdef SK_VERBOSE

--- 1553 unchanged lines hidden ---
692 if (m_new == NULL)
693 return(ENOBUFS);
694
695 /* Allocate the jumbo buffer */
696 buf = sk_jalloc(sc_if);
697 if (buf == NULL) {
698 m_freem(m_new);
699#ifdef SK_VERBOSE

--- 1553 unchanged lines hidden ---