Commit 2242d5ef 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: (29 commits)
  tcp: Restore ordering of TCP options for the sake of inter-operability
  net: Fix disjunct computation of netdev features
  sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state
  sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING state
  sctp: Add check for the TSN field of the SHUTDOWN chunk
  sctp: Drop ICMP packet too big message with MTU larger than current PMTU
  p54: enable 2.4/5GHz spectrum by eeprom bits.
  orinoco: reduce stack usage in firmware download path
  ath5k: fix suspend-related oops on rmmod
  [netdrvr] fec_mpc52xx: Implement polling, to make netconsole work.
  qlge: Fix MSI/legacy single interrupt bug.
  smc911x: Make the driver safer on SMP
  smc911x: Add IRQ polarity configuration
  smc911x: Allow Kconfig dependency on ARM
  sis190: add identifier for Atheros AR8021 PHY
  8139x: reduce message severity on driver overlap
  igb: add IGB_DCA instead of selecting INTEL_IOATDMA
  igb: fix tx data corruption with transition to L0s on 82575
  ehea: Fix memory hotplug support
  netdev: DM9000: remove BLACKFIN hacking in DM9000 netdev driver
  ...
parents 5579a782 fd6149d3

drivers/net/8139cp.c

+2 −3
Original line number Diff line number Diff line
@@ -1836,10 +1836,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 


	if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&

	    pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) {

		dev_err(&pdev->dev,

			   "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",

		dev_info(&pdev->dev,

			   "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip, use 8139too\n",

		           pdev->vendor, pdev->device, pdev->revision);

		dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n");

		return -ENODEV;

	}

drivers/net/8139too.c

+2 −3
Original line number Diff line number Diff line
@@ -946,10 +946,9 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, 
	if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&

	    pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision >= 0x20) {

		dev_info(&pdev->dev,

			   "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",

			   "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip, use 8139cp\n",

		       	   pdev->vendor, pdev->device, pdev->revision);

		dev_info(&pdev->dev,

			   "Use the \"8139cp\" driver for improved performance and stability.\n");

		return -ENODEV;

	}



	if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&

drivers/net/Kconfig

+7 −2
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ config SMC91X 
	select CRC32

	select MII

	depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \

		SOC_AU1X00 || BLACKFIN || MN10300

		MIPS || BLACKFIN || MN10300

	help

	  This is a driver for SMC's 91x series of Ethernet chipsets,

	  including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -966,7 +966,7 @@ config SMC911X 
	tristate "SMSC LAN911[5678] support"

	select CRC32

	select MII

	depends on ARCH_PXA || SUPERH

	depends on ARM || SUPERH

	help

	  This is a driver for SMSC's LAN911x series of Ethernet chipsets

	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -2009,6 +2009,11 @@ config IGB_LRO 


	  If in doubt, say N.



config IGB_DCA

	bool "Enable DCA"

	default y

	depends on IGB && DCA && !(IGB=y && DCA=m)



source "drivers/net/ixp2000/Kconfig"



config MYRI_SBUS

drivers/net/ax88796.c

+3 −3
Original line number Diff line number Diff line
@@ -838,12 +838,12 @@ static int ax_probe(struct platform_device *pdev) 


	/* find the platform resources */



	dev->irq  = platform_get_irq(pdev, 0);

	if (dev->irq < 0) {

	ret  = platform_get_irq(pdev, 0);

	if (ret < 0) {

		dev_err(&pdev->dev, "no IRQ specified\n");

		ret = -ENXIO;

		goto exit_mem;

	}

	dev->irq = ret;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

drivers/net/bonding/bond_main.c

+11 −5
Original line number Diff line number Diff line
@@ -1341,18 +1341,24 @@ static int bond_compute_features(struct bonding *bond) 
	int i;



	features &= ~(NETIF_F_ALL_CSUM | BOND_VLAN_FEATURES);

	features |= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |

		    NETIF_F_GSO_MASK | NETIF_F_NO_CSUM;

	features |=  NETIF_F_GSO_MASK | NETIF_F_NO_CSUM;



	if (!bond->first_slave)

		goto done;



	features &= ~NETIF_F_ONE_FOR_ALL;



	bond_for_each_slave(bond, slave, i) {

		features = netdev_compute_features(features,

						   slave->dev->features);

		features = netdev_increment_features(features,

						     slave->dev->features,

						     NETIF_F_ONE_FOR_ALL);

		if (slave->dev->hard_header_len > max_hard_header_len)

			max_hard_header_len = slave->dev->hard_header_len;

	}



done:

	features |= (bond_dev->features & BOND_VLAN_FEATURES);

	bond_dev->features = features;

	bond_dev->features = netdev_fix_features(features, NULL);

	bond_dev->hard_header_len = max_hard_header_len;



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE