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

Commit c71d9caf 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:
  igb: remove sysfs entry that was used to set the number of vfs
  igbvf: add new driver to support 82576 virtual functions
  drivers/net/eql.c: Fix a dev leakage.
  niu: Fix unused variable warning.
  r6040: set MODULE_VERSION
  bnx2: Don't use reserved names
  FEC driver: add missing #endif
  niu: Fix error handling
  mv643xx_eth: don't reset the rx coal timer on interface up
  smsc911x: correct debugging message on mii read timeout
  ethoc: fix library build errors
  netfilter: ctnetlink: fix regression in expectation handling
  netfilter: fix selection of "LED" target in netfilter
  netfilter: ip6tables regression fix
parents a219ee88 2a3abf6d

drivers/net/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -977,6 +977,8 @@ config ETHOC 
	depends on NET_ETHERNET && HAS_IOMEM

	select MII

	select PHYLIB

	select CRC32

	select BITREVERSE

	help

	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
@@ -2056,6 +2058,27 @@ config IGB_DCA 
	  driver.  DCA is a method for warming the CPU cache before data

	  is used, with the intent of lessening the impact of cache misses.



config IGBVF

       tristate "Intel(R) 82576 Virtual Function Ethernet support"

       depends on PCI

       ---help---

         This driver supports Intel(R) 82576 virtual functions.  For more

         information on how to identify your adapter, go to the Adapter &

         Driver ID Guide at:



         <http://support.intel.com/support/network/adapter/pro100/21397.htm>



         For general information and support, go to the Intel support

         website at:



         <http://support.intel.com>



         More specific information on configuring the driver is in

         <file:Documentation/networking/e1000.txt>.



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

         will be called igbvf.



source "drivers/net/ixp2000/Kconfig"



config MYRI_SBUS

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_E1000) += e1000/ 
obj-$(CONFIG_E1000E) += e1000e/

obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/

obj-$(CONFIG_IGB) += igb/

obj-$(CONFIG_IGBVF) += igbvf/

obj-$(CONFIG_IXGBE) += ixgbe/

obj-$(CONFIG_IXGB) += ixgb/

obj-$(CONFIG_IP1000) += ipg.o

drivers/net/bnx2.c

+13 −13
Original line number Diff line number Diff line
@@ -3427,8 +3427,8 @@ static int __devinit 
bnx2_request_firmware(struct bnx2 *bp)

{

	const char *mips_fw_file, *rv2p_fw_file;

	const struct bnx2_mips_fw_file *mips;

	const struct bnx2_rv2p_fw_file *rv2p;

	const struct bnx2_mips_fw_file *mips_fw;

	const struct bnx2_rv2p_fw_file *rv2p_fw;

	int rc;



	if (CHIP_NUM(bp) == CHIP_NUM_5709) {
@@ -3452,21 +3452,21 @@ bnx2_request_firmware(struct bnx2 *bp) 
		       rv2p_fw_file);

		return rc;

	}

	mips = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data;

	rv2p = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data;

	if (bp->mips_firmware->size < sizeof(*mips) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->com) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->cp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->rxp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->tpat) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->txp)) {

	mips_fw = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data;

	rv2p_fw = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data;

	if (bp->mips_firmware->size < sizeof(*mips_fw) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->com) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->cp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->rxp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->tpat) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->txp)) {

		printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n",

		       mips_fw_file);

		return -EINVAL;

	}

	if (bp->rv2p_firmware->size < sizeof(*rv2p) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p->proc1.rv2p, 8, true) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p->proc2.rv2p, 8, true)) {

	if (bp->rv2p_firmware->size < sizeof(*rv2p_fw) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p_fw->proc1.rv2p, 8, true) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p_fw->proc2.rv2p, 8, true)) {

		printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n",

		       rv2p_fw_file);

		return -EINVAL;

drivers/net/eql.c

+2 −0
Original line number Diff line number Diff line
@@ -542,6 +542,8 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *scp) 
	}

	spin_unlock_bh(&eql->queue.lock);



	dev_put(slave_dev);



	return ret;

}

drivers/net/fec.c

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ static void __inline__ fec_phy_ack_intr(void) 
	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);

	*icrp = 0x0d000000;

}

#endif



#ifdef CONFIG_M5272

static void __inline__ fec_get_mac(struct net_device *dev)