Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c6e7ad authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents c3227e54 48d3ff82

drivers/net/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -928,6 +928,16 @@ config SMC91X 
	  The module will be called smc91x.  If you want to compile it as a

	  module, say M here and read <file:Documentation/kbuild/modules.txt>.



config PXA168_ETH

	tristate "Marvell pxa168 ethernet support"

	depends on CPU_PXA168

	select PHYLIB

	help

	  This driver supports the pxa168 Ethernet ports.



	  To compile this driver as a module, choose M here. The module

	  will be called pxa168_eth.



config NET_NETX

	tristate "NetX Ethernet support"

	select MII

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ obj-$(CONFIG_MYRI10GE) += myri10ge/ 
obj-$(CONFIG_SMC91X) += smc91x.o

obj-$(CONFIG_SMC911X) += smc911x.o

obj-$(CONFIG_SMSC911X) += smsc911x.o

obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_BFIN_MAC) += bfin_mac.o

obj-$(CONFIG_DM9000) += dm9000.o

obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o

drivers/net/bnx2x/bnx2x.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 * (you will need to reboot afterwards) */

/* #define BNX2X_STOP_ON_ERROR */



#define DRV_MODULE_VERSION      "1.52.53-3"

#define DRV_MODULE_RELDATE      "2010/18/04"

#define DRV_MODULE_VERSION      "1.52.53-4"

#define DRV_MODULE_RELDATE      "2010/16/08"

#define BNX2X_BC_VER            0x040200



#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

drivers/net/bnx2x/bnx2x_main.c

+7 −2
Original line number Diff line number Diff line
@@ -4328,10 +4328,12 @@ static int bnx2x_init_port(struct bnx2x *bp) 
		val |= aeu_gpio_mask;

		REG_WR(bp, offset, val);

		}

		bp->port.need_hw_lock = 1;

		break;



	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:

	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727:

		bp->port.need_hw_lock = 1;

	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:

		/* add SPIO 5 to group 0 */

		{

		u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
@@ -4341,7 +4343,10 @@ static int bnx2x_init_port(struct bnx2x *bp) 
		REG_WR(bp, reg_addr, val);

		}

		break;



	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:

	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:

		bp->port.need_hw_lock = 1;

		break;

	default:

		break;

	}

drivers/net/e1000e/82571.c

+18 −13
Original line number Diff line number Diff line
@@ -936,12 +936,14 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 
	ew32(IMC, 0xffffffff);

	icr = er32(ICR);



	if (hw->mac.type == e1000_82571) {

		/* Install any alternate MAC address into RAR0 */

		ret_val = e1000_check_alt_mac_addr_generic(hw);

		if (ret_val)

			return ret_val;



		e1000e_set_laa_state_82571(hw, true);

	}



	/* Reinitialize the 82571 serdes link state machine */

	if (hw->phy.media_type == e1000_media_type_internal_serdes)
@@ -1618,6 +1620,7 @@ static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw) 
{

	s32 ret_val = 0;



	if (hw->mac.type == e1000_82571) {

		/*

		 * If there's an alternate MAC address place it in RAR0

		 * so that it will override the Si installed default perm
@@ -1626,6 +1629,7 @@ static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw) 
		ret_val = e1000_check_alt_mac_addr_generic(hw);

		if (ret_val)

			goto out;

	}



	ret_val = e1000_read_mac_addr_generic(hw);
@@ -1833,6 +1837,7 @@ struct e1000_info e1000_82573_info = { 
				  | FLAG_HAS_SMART_POWER_DOWN

				  | FLAG_HAS_AMT

				  | FLAG_HAS_SWSM_ON_LOAD,

	.flags2			= FLAG2_DISABLE_ASPM_L1,

	.pba			= 20,

	.max_hw_frame_size	= ETH_FRAME_LEN + ETH_FCS_LEN,

	.get_variants		= e1000_get_variants_82571,