tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
+19
-3
+18
-3
drivers/net/tg3.c
+18
-3
drivers/net/tg3.c
···
7
7
* Copyright (C) 2005 Broadcom Corporation.
8
8
*
9
9
* Firmware is:
10
-
* Copyright (C) 2000-2003 Broadcom Corporation.
10
+
* Derived from proprietary unpublished source code,
11
+
* Copyright (C) 2000-2003 Broadcom Corporation.
12
+
*
13
+
* Permission is hereby granted for the distribution of this firmware
14
+
* data in hexadecimal or equivalent format, provided this copyright
15
+
* notice is accompanying it.
11
16
*/
12
17
13
18
#include <linux/config.h>
···
66
61
67
62
#define DRV_MODULE_NAME "tg3"
68
63
#define PFX DRV_MODULE_NAME ": "
69
-
#define DRV_MODULE_VERSION "3.29"
70
-
#define DRV_MODULE_RELDATE "May 23, 2005"
64
+
#define DRV_MODULE_VERSION "3.30"
65
+
#define DRV_MODULE_RELDATE "June 6, 2005"
71
66
72
67
#define TG3_DEF_MAC_MODE 0
73
68
#define TG3_DEF_RX_MODE 0
···
8560
8555
8561
8556
case NIC_SRAM_DATA_CFG_LED_MODE_MAC:
8562
8557
tp->led_ctrl = LED_CTRL_MODE_MAC;
8558
+
8559
+
/* Default to PHY_1_MODE if 0 (MAC_MODE) is
8560
+
* read on some older 5700/5701 bootcode.
8561
+
*/
8562
+
if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
8563
+
ASIC_REV_5700 ||
8564
+
GET_ASIC_REV(tp->pci_chip_rev_id) ==
8565
+
ASIC_REV_5701)
8566
+
tp->led_ctrl = LED_CTRL_MODE_PHY_1;
8567
+
8563
8568
break;
8564
8569
8565
8570
case SHASTA_EXT_LED_SHARED:
+1
drivers/pci/pci.ids
+1
drivers/pci/pci.ids
···
7173
7173
080f Sentry5 DDR/SDR RAM Controller
7174
7174
0811 Sentry5 External Interface Core
7175
7175
0816 BCM3302 Sentry5 MIPS32 CPU
7176
+
1600 NetXtreme BCM5752 Gigabit Ethernet PCI Express
7176
7177
1644 NetXtreme BCM5700 Gigabit Ethernet
7177
7178
1014 0277 Broadcom Vigil B5700 1000Base-T
7178
7179
1028 00d1 Broadcom BCM5700