Commit d1b113bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  netfilter: fix CONFIG_COMPAT support
  isdn/avm: fix build when PCMCIA is not enabled
  header: fix broken headers for user space
  e1000e: don't check for alternate MAC addr on parts that don't support it
  e1000e: disable ASPM L1 on 82573
  ll_temac: Fix poll implementation
  netxen: fix a race in netxen_nic_get_stats()
  qlnic: fix a race in qlcnic_get_stats()
  irda: fix a race in irlan_eth_xmit()
  net: sh_eth: remove unused variable
  netxen: update version 4.0.74
  netxen: fix inconsistent lock state
  vlan: Match underlying dev carrier on vlan add
  ibmveth: Fix opps during MTU change on an active device
  ehea: Fix synchronization between HW and SW send queue
  bnx2x: Update bnx2x version to 1.52.53-4
  bnx2x: Fix PHY locking problem
  rds: fix a leak of kernel memory
  netlink: fix compat recvmsg
  netfilter: fix userspace header warning
  ...
parents 9c5ea367 cca77b7c

drivers/isdn/hardware/avm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ config ISDN_DRV_AVMB1_T1ISA 


config ISDN_DRV_AVMB1_B1PCMCIA

	tristate "AVM B1/M1/M2 PCMCIA support"

	depends on PCMCIA

	help

	  Enable support for the PCMCIA version of the AVM B1 card.



config ISDN_DRV_AVMB1_AVM_CS

	tristate "AVM B1/M1/M2 PCMCIA cs module"

	depends on ISDN_DRV_AVMB1_B1PCMCIA && PCMCIA

	depends on ISDN_DRV_AVMB1_B1PCMCIA

	help

	  Enable the PCMCIA client driver for the AVM B1/M1/M2

	  PCMCIA cards.

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
@@ -244,6 +244,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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE