Deleted Added
full compact
if_re.c (159962) if_re.c (160008)
1/*-
2 * Copyright (c) 1997, 1998-2003
3 * Bill Paul <wpaul@windriver.com>. 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-2003
3 * Bill Paul <wpaul@windriver.com>. 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/re/if_re.c 159962 2006-06-26 20:31:32Z wpaul $");
34__FBSDID("$FreeBSD: head/sys/dev/re/if_re.c 160008 2006-06-28 16:04:54Z wpaul $");
35
36/*
37 * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

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

168static struct rl_type re_devs[] = {
169 { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S,
170 "D-Link DGE-528(T) Gigabit Ethernet Adapter" },
171 { RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS,
172 "RealTek 8139C+ 10/100BaseTX" },
173 { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E,
174 "RealTek 8101E PCIe 10/100baseTX" },
175 { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168,
35
36/*
37 * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

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

168static struct rl_type re_devs[] = {
169 { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S,
170 "D-Link DGE-528(T) Gigabit Ethernet Adapter" },
171 { RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS,
172 "RealTek 8139C+ 10/100BaseTX" },
173 { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E,
174 "RealTek 8101E PCIe 10/100baseTX" },
175 { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168,
176 "RealTek 8168B/8111B PCIe Gigabit Ethernet" },
176 "RealTek 8168B PCIe Gigabit Ethernet" },
177 { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8111,
178 "RealTek 8111B PCIe Gigabit Ethernet" },
177 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169,
178 "RealTek 8169 Gigabit Ethernet" },
179 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S,
180 "RealTek 8169S Single-chip Gigabit Ethernet" },
181 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB,
182 "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" },
183 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC,
184 "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" },

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

205 { RL_HWREV_8169S, RL_8169, "8169S"},
206 { RL_HWREV_8110S, RL_8169, "8110S"},
207 { RL_HWREV_8169_8110SB, RL_8169, "8169SB"},
208 { RL_HWREV_8169_8110SC, RL_8169, "8169SC"},
209 { RL_HWREV_8100, RL_8139, "8100"},
210 { RL_HWREV_8101, RL_8139, "8101"},
211 { RL_HWREV_8100E, RL_8169, "8100E"},
212 { RL_HWREV_8101E, RL_8169, "8101E"},
179 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169,
180 "RealTek 8169 Gigabit Ethernet" },
181 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S,
182 "RealTek 8169S Single-chip Gigabit Ethernet" },
183 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB,
184 "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" },
185 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC,
186 "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" },

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

207 { RL_HWREV_8169S, RL_8169, "8169S"},
208 { RL_HWREV_8110S, RL_8169, "8110S"},
209 { RL_HWREV_8169_8110SB, RL_8169, "8169SB"},
210 { RL_HWREV_8169_8110SC, RL_8169, "8169SC"},
211 { RL_HWREV_8100, RL_8139, "8100"},
212 { RL_HWREV_8101, RL_8139, "8101"},
213 { RL_HWREV_8100E, RL_8169, "8100E"},
214 { RL_HWREV_8101E, RL_8169, "8101E"},
215 { RL_HWREV_8111, RL_8169, "8111"},
213 { 0, 0, NULL }
214};
215
216static int re_probe (device_t);
217static int re_attach (device_t);
218static int re_detach (device_t);
219
220static int re_encap (struct rl_softc *, struct mbuf **, int *);

--- 2424 unchanged lines hidden ---
216 { 0, 0, NULL }
217};
218
219static int re_probe (device_t);
220static int re_attach (device_t);
221static int re_detach (device_t);
222
223static int re_encap (struct rl_softc *, struct mbuf **, int *);

--- 2424 unchanged lines hidden ---