Deleted Added
full compact
if_re.c (170813) if_re.c (171263)
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 170813 2007-06-16 02:54:19Z yongari $");
34__FBSDID("$FreeBSD: head/sys/dev/re/if_re.c 171263 2007-07-06 00:05:12Z yongari $");
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 */

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

1206 while (hw_rev->rl_desc != NULL) {
1207 if (hw_rev->rl_rev == hwrev) {
1208 sc->rl_type = hw_rev->rl_type;
1209 break;
1210 }
1211 hw_rev++;
1212 }
1213
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 */

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

1206 while (hw_rev->rl_desc != NULL) {
1207 if (hw_rev->rl_rev == hwrev) {
1208 sc->rl_type = hw_rev->rl_type;
1209 break;
1210 }
1211 hw_rev++;
1212 }
1213
1214 sc->rl_eewidth = 6;
1214 sc->rl_eewidth = RL_9356_ADDR_LEN;
1215 re_read_eeprom(sc, (caddr_t)&re_did, 0, 1);
1216 if (re_did != 0x8129)
1215 re_read_eeprom(sc, (caddr_t)&re_did, 0, 1);
1216 if (re_did != 0x8129)
1217 sc->rl_eewidth = 8;
1217 sc->rl_eewidth = RL_9346_ADDR_LEN;
1218
1219 /*
1220 * Get station address from the EEPROM.
1221 */
1222 re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3);
1223 for (i = 0; i < ETHER_ADDR_LEN / 2; i++)
1224 as[i] = le16toh(as[i]);
1225 bcopy(as, eaddr, sizeof(eaddr));

--- 1511 unchanged lines hidden ---
1218
1219 /*
1220 * Get station address from the EEPROM.
1221 */
1222 re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3);
1223 for (i = 0; i < ETHER_ADDR_LEN / 2; i++)
1224 as[i] = le16toh(as[i]);
1225 bcopy(as, eaddr, sizeof(eaddr));

--- 1511 unchanged lines hidden ---