Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (255333c1) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+4 −28

Original line number	Diff line number	Diff line
		@@ -2039,43 +2039,19 @@ M: kernel@wantstofly.org
		L: netdev@vger.kernel.org
		S: Maintained

		INTEL PRO/100 ETHERNET SUPPORT
		INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
		P: Auke Kok
		M: auke-jan.h.kok@intel.com
		P: Jesse Brandeburg
		M: jesse.brandeburg@intel.com
		P: Jeff Kirsher
		M: jeffrey.t.kirsher@intel.com
		P: Bruce Allan
		M: bruce.w.allan@intel.com
		P: John Ronciak
		M: john.ronciak@intel.com
		L: e1000-devel@lists.sourceforge.net
		W: http://sourceforge.net/projects/e1000/
		S: Supported

		INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
		P: Auke Kok
		M: auke-jan.h.kok@intel.com
		P: Jesse Brandeburg
		M: jesse.brandeburg@intel.com
		P: Jeff Kirsher
		M: jeffrey.t.kirsher@intel.com
		P: John Ronciak
		M: john.ronciak@intel.com
		L: e1000-devel@lists.sourceforge.net
		W: http://sourceforge.net/projects/e1000/
		S: Supported

		INTEL PRO/10GbE SUPPORT
		P: Ayyappan Veeraiyan
		M: ayyappan.veeraiyan@intel.com
		P: Auke Kok
		M: auke-jan.h.kok@intel.com
		P: Jesse Brandeburg
		M: jesse.brandeburg@intel.com
		P: John Ronciak
		M: john.ronciak@intel.com
		L: e1000-devel@lists.sourceforge.net
		W: http://sourceforge.net/projects/e1000/
		W: http://e1000.sourceforge.net/
		S: Supported

		INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

drivers/net/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -2519,7 +2519,7 @@ config CHELSIO_T3

		config EHEA
		tristate "eHEA Ethernet support"
		depends on IBMEBUS && INET
		depends on IBMEBUS && INET && SPARSEMEM
		select INET_LRO
		---help---
		This driver supports the IBM pSeries eHEA ethernet adapter.

drivers/net/atarilance.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -336,8 +336,6 @@ struct lance_addr {

		/*************************** Prototypes ***************************/

		static int addr_accessible( volatile void *regp, int wordflag, int
		writeflag );
		static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
		*init_rec );
		static int lance_open( struct net_device *dev );
		@@ -406,7 +404,8 @@ struct net_device * __init atarilance_probe(int unit)

		/* Derived from hwreg_present() in atari/config.c: */

		static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag )
		static noinline int __init addr_accessible(volatile void *regp, int wordflag,
		int writeflag)
		{
		int ret;
		long flags;

drivers/net/e100.c

+3 −26

Original line number	Diff line number	Diff line
		@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)
		}
		}

		#ifdef CONFIG_PM
		static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
		{
		struct net_device *netdev = pci_get_drvdata(pdev);
		struct nic *nic = netdev_priv(netdev);

		if (netif_running(netdev))
		napi_disable(&nic->napi);
		del_timer_sync(&nic->watchdog);
		netif_carrier_off(nic->netdev);
		e100_down(nic);
		netif_device_detach(netdev);

		pci_save_state(pdev);
		@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
		pci_enable_wake(pdev, PCI_D3cold, 0);
		}

		free_irq(pdev->irq, netdev);

		pci_disable_device(pdev);
		pci_set_power_state(pdev, PCI_D3hot);

		return 0;
		}

		#ifdef CONFIG_PM
		static int e100_resume(struct pci_dev *pdev)
		{
		struct net_device *netdev = pci_get_drvdata(pdev);
		@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)

		static void e100_shutdown(struct pci_dev *pdev)
		{
		struct net_device *netdev = pci_get_drvdata(pdev);
		struct nic *nic = netdev_priv(netdev);

		if (netif_running(netdev))
		napi_disable(&nic->napi);
		del_timer_sync(&nic->watchdog);
		netif_carrier_off(nic->netdev);

		if ((nic->flags & wol_magic) \| e100_asf(nic)) {
		pci_enable_wake(pdev, PCI_D3hot, 1);
		pci_enable_wake(pdev, PCI_D3cold, 1);
		} else {
		pci_enable_wake(pdev, PCI_D3hot, 0);
		pci_enable_wake(pdev, PCI_D3cold, 0);
		}

		free_irq(pdev->irq, netdev);

		pci_disable_device(pdev);
		pci_set_power_state(pdev, PCI_D3hot);
		e100_suspend(pdev, PMSG_SUSPEND);
		}

		/* ------------------ PCI Error Recovery infrastructure -------------- */

drivers/net/ixgbe/ixgbe_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2133,7 +2133,7 @@ static void ixgbe_watchdog(unsigned long data)
		(link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
		"10 Gbps" :
		(link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
		"1 Gpbs" : "unknown speed")),
		"1 Gbps" : "unknown speed")),
		((FLOW_RX && FLOW_TX) ? "RX/TX" :
		(FLOW_RX ? "RX" :
		(FLOW_TX ? "TX" : "None"))));