Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (323dbaba) · Commits · jan.koester / Linux

MAINTAINERS

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3884,10 +3884,13 @@ M: trivial@kernel.org
	L: linux-kernel@vger.kernel.org		L: linux-kernel@vger.kernel.org
	S: Maintained		S: Maintained

	TULIP NETWORK DRIVER		TULIP NETWORK DRIVERS
	L: tulip-users@lists.sourceforge.net		P: Grant Grundler
	W: http://sourceforge.net/projects/tulip/		M: grundler@parisc-linux.org
	S: Orphan		P: Kyle McMartin
			M: kyle@parisc-linux.org
			L: netdev@vger.kernel.org
			S: Maintained

	TUN/TAP driver		TUN/TAP driver
	P: Maxim Krasnyansky		P: Maxim Krasnyansky

drivers/net/cs89x0.c

+6 −6

drivers/net/e1000e/82571.c

+6 −16

Original line number	Original line	Diff line number	Diff line
	@@ -438,7 +438,7 @@ static void e1000_release_nvm_82571(struct e1000_hw *hw)
	* For non-82573 silicon, write data to EEPROM at offset using SPI interface.		* For non-82573 silicon, write data to EEPROM at offset using SPI interface.
	*		*
	* If e1000e_update_nvm_checksum is not called after this function, the		* If e1000e_update_nvm_checksum is not called after this function, the
	* EEPROM will most likley contain an invalid checksum.		* EEPROM will most likely contain an invalid checksum.
	**/		**/
	static s32 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,		static s32 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,
	u16 *data)		u16 *data)
	@@ -547,7 +547,7 @@ static s32 e1000_validate_nvm_checksum_82571(struct e1000_hw *hw)
	* poll for completion.		* poll for completion.
	*		*
	* If e1000e_update_nvm_checksum is not called after this function, the		* If e1000e_update_nvm_checksum is not called after this function, the
	* EEPROM will most likley contain an invalid checksum.		* EEPROM will most likely contain an invalid checksum.
	**/		**/
	static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,		static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
	u16 words, u16 *data)		u16 words, u16 *data)
	@@ -1053,7 +1053,7 @@ static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw)
	/* If SerDes loopback mode is entered, there is no form		/* If SerDes loopback mode is entered, there is no form
	* of reset to take the adapter out of that mode. So we		* of reset to take the adapter out of that mode. So we
	* have to explicitly take the adapter out of loopback		* have to explicitly take the adapter out of loopback
	* mode. This prevents drivers from twidling their thumbs		* mode. This prevents drivers from twiddling their thumbs
	* if another tool failed to take it out of loopback mode.		* if another tool failed to take it out of loopback mode.
	*/		*/
	ew32(SCTL,		ew32(SCTL,
	@@ -1098,7 +1098,7 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw hw, u16 data)
	* e1000e_get_laa_state_82571 - Get locally administered address state		* e1000e_get_laa_state_82571 - Get locally administered address state
	* @hw: pointer to the HW structure		* @hw: pointer to the HW structure
	*		*
	* Retrieve and return the current locally administed address state.		* Retrieve and return the current locally administered address state.
	**/		**/
	bool e1000e_get_laa_state_82571(struct e1000_hw *hw)		bool e1000e_get_laa_state_82571(struct e1000_hw *hw)
	{		{
	@@ -1113,7 +1113,7 @@ bool e1000e_get_laa_state_82571(struct e1000_hw *hw)
	* @hw: pointer to the HW structure		* @hw: pointer to the HW structure
	* @state: enable/disable locally administered address		* @state: enable/disable locally administered address
	*		*
	* Enable/Disable the current locally administed address state.		* Enable/Disable the current locally administers address state.
	**/		**/
	void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)		void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)
	{		{
	@@ -1280,16 +1280,6 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
	};		};

	static struct e1000_nvm_operations e82571_nvm_ops = {		static struct e1000_nvm_operations e82571_nvm_ops = {
	.acquire_nvm = e1000_acquire_nvm_82571,
	.read_nvm = e1000e_read_nvm_spi,
	.release_nvm = e1000_release_nvm_82571,
	.update_nvm = e1000_update_nvm_checksum_82571,
	.valid_led_default = e1000_valid_led_default_82571,
	.validate_nvm = e1000_validate_nvm_checksum_82571,
	.write_nvm = e1000_write_nvm_82571,
	};

	static struct e1000_nvm_operations e82573_nvm_ops = {
	.acquire_nvm = e1000_acquire_nvm_82571,		.acquire_nvm = e1000_acquire_nvm_82571,
	.read_nvm = e1000e_read_nvm_eerd,		.read_nvm = e1000e_read_nvm_eerd,
	.release_nvm = e1000_release_nvm_82571,		.release_nvm = e1000_release_nvm_82571,
	@@ -1355,6 +1345,6 @@ struct e1000_info e1000_82573_info = {
	.get_invariants = e1000_get_invariants_82571,		.get_invariants = e1000_get_invariants_82571,
	.mac_ops = &e82571_mac_ops,		.mac_ops = &e82571_mac_ops,
	.phy_ops = &e82_phy_ops_m88,		.phy_ops = &e82_phy_ops_m88,
	.nvm_ops = &e82573_nvm_ops,		.nvm_ops = &e82571_nvm_ops,
	};		};

drivers/net/e1000e/defines.h

+5 −5

drivers/net/e1000e/e1000.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -42,8 +42,7 @@
	struct e1000_info;		struct e1000_info;

	#define ndev_printk(level, netdev, format, arg...) \		#define ndev_printk(level, netdev, format, arg...) \
	printk(level "%s: %s: " format, (netdev)->dev.parent->bus_id, \		printk(level "%s: " format, (netdev)->name, ## arg)
	(netdev)->name, ## arg)

	#ifdef DEBUG		#ifdef DEBUG
	#define ndev_dbg(netdev, format, arg...) \		#define ndev_dbg(netdev, format, arg...) \

Original line number	Original line	Diff line number	Diff line
	@@ -172,30 +172,30 @@ static char version[] __initdata =
	them to system IRQ numbers. This mapping is card specific and is set to		them to system IRQ numbers. This mapping is card specific and is set to
	the configuration of the Cirrus Eval board for this chip. */		the configuration of the Cirrus Eval board for this chip. */
	#ifdef CONFIG_ARCH_CLPS7500		#ifdef CONFIG_ARCH_CLPS7500
	static unsigned int netcard_portlist[] __initdata =		static unsigned int netcard_portlist[] __used __initdata =
	{ 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};		{ 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
	static unsigned int cs8900_irq_map[] = {12,0,0,0};		static unsigned int cs8900_irq_map[] = {12,0,0,0};
	#elif defined(CONFIG_SH_HICOSH4)		#elif defined(CONFIG_SH_HICOSH4)
	static unsigned int netcard_portlist[] __initdata =		static unsigned int netcard_portlist[] __used __initdata =
	{ 0x0300, 0};		{ 0x0300, 0};
	static unsigned int cs8900_irq_map[] = {1,0,0,0};		static unsigned int cs8900_irq_map[] = {1,0,0,0};
	#elif defined(CONFIG_MACH_IXDP2351)		#elif defined(CONFIG_MACH_IXDP2351)
	static unsigned int netcard_portlist[] __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};		static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};
	static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};		static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
	#include <asm/irq.h>		#include <asm/irq.h>
	#elif defined(CONFIG_ARCH_IXDP2X01)		#elif defined(CONFIG_ARCH_IXDP2X01)
	#include <asm/irq.h>		#include <asm/irq.h>
	static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};		static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
	static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};		static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
	#elif defined(CONFIG_ARCH_PNX010X)		#elif defined(CONFIG_ARCH_PNX010X)
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/arch/gpio.h>		#include <asm/arch/gpio.h>
	#define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */		#define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */
	#define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */		#define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
	static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0};		static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
	static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};		static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
	#else		#else
	static unsigned int netcard_portlist[] __initdata =		static unsigned int netcard_portlist[] __used __initdata =
	{ 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};		{ 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
	static unsigned int cs8900_irq_map[] = {10,11,12,5};		static unsigned int cs8900_irq_map[] = {10,11,12,5};
	#endif		#endif

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@
	#define E1000_WUFC_ARP 0x00000020 /* ARP Request Packet Wakeup Enable */		#define E1000_WUFC_ARP 0x00000020 /* ARP Request Packet Wakeup Enable */

	/* Extended Device Control */		/* Extended Device Control */
	#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */		#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */
	#define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */		#define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */
	#define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */		#define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */
	#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000		#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
	@@ -75,12 +75,12 @@
	#define E1000_CTRL_EXT_IAME 0x08000000 /* Interrupt acknowledge Auto-mask */		#define E1000_CTRL_EXT_IAME 0x08000000 /* Interrupt acknowledge Auto-mask */
	#define E1000_CTRL_EXT_INT_TIMER_CLR 0x20000000 /* Clear Interrupt timers after IMS clear */		#define E1000_CTRL_EXT_INT_TIMER_CLR 0x20000000 /* Clear Interrupt timers after IMS clear */

	/* Receive Decriptor bit definitions */		/* Receive Descriptor bit definitions */
	#define E1000_RXD_STAT_DD 0x01 /* Descriptor Done */		#define E1000_RXD_STAT_DD 0x01 /* Descriptor Done */
	#define E1000_RXD_STAT_EOP 0x02 /* End of Packet */		#define E1000_RXD_STAT_EOP 0x02 /* End of Packet */
	#define E1000_RXD_STAT_IXSM 0x04 /* Ignore checksum */		#define E1000_RXD_STAT_IXSM 0x04 /* Ignore checksum */
	#define E1000_RXD_STAT_VP 0x08 /* IEEE VLAN Packet */		#define E1000_RXD_STAT_VP 0x08 /* IEEE VLAN Packet */
	#define E1000_RXD_STAT_UDPCS 0x10 /* UDP xsum caculated */		#define E1000_RXD_STAT_UDPCS 0x10 /* UDP xsum calculated */
	#define E1000_RXD_STAT_TCPCS 0x20 /* TCP xsum calculated */		#define E1000_RXD_STAT_TCPCS 0x20 /* TCP xsum calculated */
	#define E1000_RXD_ERR_CE 0x01 /* CRC Error */		#define E1000_RXD_ERR_CE 0x01 /* CRC Error */
	#define E1000_RXD_ERR_SE 0x02 /* Symbol Error */		#define E1000_RXD_ERR_SE 0x02 /* Symbol Error */
	@@ -223,7 +223,7 @@
	#define E1000_STATUS_LAN_INIT_DONE 0x00000200 /* Lan Init Completion by NVM */		#define E1000_STATUS_LAN_INIT_DONE 0x00000200 /* Lan Init Completion by NVM */
	#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */		#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */

	/* Constants used to intrepret the masked PCI-X bus speed. */		/* Constants used to interpret the masked PCI-X bus speed. */

	#define HALF_DUPLEX 1		#define HALF_DUPLEX 1
	#define FULL_DUPLEX 2		#define FULL_DUPLEX 2
	@@ -517,7 +517,7 @@
	/* PHY 1000 MII Register/Bit Definitions */		/* PHY 1000 MII Register/Bit Definitions */
	/* PHY Registers defined by IEEE */		/* PHY Registers defined by IEEE */
	#define PHY_CONTROL 0x00 /* Control Register */		#define PHY_CONTROL 0x00 /* Control Register */
	#define PHY_STATUS 0x01 /* Status Regiser */		#define PHY_STATUS 0x01 /* Status Register */
	#define PHY_ID1 0x02 /* Phy Id Reg (word 1) */		#define PHY_ID1 0x02 /* Phy Id Reg (word 1) */
	#define PHY_ID2 0x03 /* Phy Id Reg (word 2) */		#define PHY_ID2 0x03 /* Phy Id Reg (word 2) */
	#define PHY_AUTONEG_ADV 0x04 /* Autoneg Advertisement */		#define PHY_AUTONEG_ADV 0x04 /* Autoneg Advertisement */