Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 (ef130126) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/tg3.c

+18 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,12 @@
	* Copyright (C) 2005 Broadcom Corporation.		* Copyright (C) 2005 Broadcom Corporation.
	*		*
	* Firmware is:		* Firmware is:
			* Derived from proprietary unpublished source code,
	* Copyright (C) 2000-2003 Broadcom Corporation.		* Copyright (C) 2000-2003 Broadcom Corporation.
			*
			* Permission is hereby granted for the distribution of this firmware
			* data in hexadecimal or equivalent format, provided this copyright
			* notice is accompanying it.
	*/		*/

	#include <linux/config.h>		#include <linux/config.h>
	@@ -61,8 +66,8 @@

	#define DRV_MODULE_NAME "tg3"		#define DRV_MODULE_NAME "tg3"
	#define PFX DRV_MODULE_NAME ": "		#define PFX DRV_MODULE_NAME ": "
	#define DRV_MODULE_VERSION "3.29"		#define DRV_MODULE_VERSION "3.30"
	#define DRV_MODULE_RELDATE "May 23, 2005"		#define DRV_MODULE_RELDATE "June 6, 2005"

	#define TG3_DEF_MAC_MODE 0		#define TG3_DEF_MAC_MODE 0
	#define TG3_DEF_RX_MODE 0		#define TG3_DEF_RX_MODE 0
	@@ -8555,6 +8560,16 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)

	case NIC_SRAM_DATA_CFG_LED_MODE_MAC:		case NIC_SRAM_DATA_CFG_LED_MODE_MAC:
	tp->led_ctrl = LED_CTRL_MODE_MAC;		tp->led_ctrl = LED_CTRL_MODE_MAC;

			/* Default to PHY_1_MODE if 0 (MAC_MODE) is
			* read on some older 5700/5701 bootcode.
			*/
			if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
			ASIC_REV_5700 \|\|
			GET_ASIC_REV(tp->pci_chip_rev_id) ==
			ASIC_REV_5701)
			tp->led_ctrl = LED_CTRL_MODE_PHY_1;

	break;		break;

	case SHASTA_EXT_LED_SHARED:		case SHASTA_EXT_LED_SHARED:

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7173,6 +7173,7 @@
	080f Sentry5 DDR/SDR RAM Controller		080f Sentry5 DDR/SDR RAM Controller
	0811 Sentry5 External Interface Core		0811 Sentry5 External Interface Core
	0816 BCM3302 Sentry5 MIPS32 CPU		0816 BCM3302 Sentry5 MIPS32 CPU
			1600 NetXtreme BCM5752 Gigabit Ethernet PCI Express
	1644 NetXtreme BCM5700 Gigabit Ethernet		1644 NetXtreme BCM5700 Gigabit Ethernet
	1014 0277 Broadcom Vigil B5700 1000Base-T		1014 0277 Broadcom Vigil B5700 1000Base-T
	1028 00d1 Broadcom BCM5700		1028 00d1 Broadcom BCM5700