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

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

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (22 commits)
  [PATCH] ibmveth: Fix index increment calculation
  [PATCH] Fix timer race
  [PATCH] Remove useless comment from sb1250
  [PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes
  [PATCH] sky2: 88E803X transmit lockup
  [PATCH] e1000: Reset all functions after a PCI error
  [PATCH] WAN/pc300: handle, propagate minor errors
  [PATCH] Update smc91x driver with ARM Versatile board info
  [PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls
  [PATCH] zd1211rw: fix build-break caused by association race fix
  [PATCH] sotftmac: fix a slab corruption in WEP restricted key association
  [PATCH] airo: check if need to freeze
  [PATCH] wireless: More WE-21 potential overflows...
  [PATCH] zd1201: Possible NULL dereference
  [PATCH] orinoco: fix WE-21 buffer overflow
  [PATCH] airo.c: check returned values
  [PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM
  [PATCH] bcm43xx-softmac: check returned value from pci_enable_device
  [PATCH] softmac: Fix WX and association related races
  [PATCH] bcm43xx: fix race condition in periodic work handler
  ...
parents 946b9243 5826cade

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND 


config UGETH_HAS_GIGA

	bool

	depends on UCC_GETH && MPC836x

	depends on UCC_GETH && PPC_MPC836x



config MV643XX_ETH

	tristate "MV-643XX Ethernet support"

drivers/net/e1000/e1000_main.c

+0 −4
Original line number Diff line number Diff line
@@ -4914,10 +4914,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) 
	pci_enable_wake(pdev, PCI_D3hot, 0);

	pci_enable_wake(pdev, PCI_D3cold, 0);



	/* Perform card reset only on one instance of the card */

	if (PCI_FUNC (pdev->devfn) != 0)

		return PCI_ERS_RESULT_RECOVERED;



	e1000_reset(adapter);

	E1000_WRITE_REG(&adapter->hw, WUS, ~0);

drivers/net/ioc3-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ static void ioc3_init(struct net_device *dev) 
	struct ioc3_private *ip = netdev_priv(dev);

	struct ioc3 *ioc3 = ip->regs;



	del_timer(&ip->ioc3_timer);		/* Kill if running	*/

	del_timer_sync(&ip->ioc3_timer);	/* Kill if running	*/



	ioc3_w_emcr(EMCR_RST);			/* Reset		*/

	(void) ioc3_r_emcr();			/* Flush WB		*/
@@ -1081,7 +1081,7 @@ static int ioc3_close(struct net_device *dev) 
{

	struct ioc3_private *ip = netdev_priv(dev);



	del_timer(&ip->ioc3_timer);

	del_timer_sync(&ip->ioc3_timer);



	netif_stop_queue(dev);

drivers/net/r8169.c

+6 −1
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static struct pci_device_id rtl8169_pci_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8168), 0, 0, RTL_CFG_2 },

	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(0x1259,			0xc107), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(0x16ec,			0x0116), 0, 0, RTL_CFG_0 },

	{ PCI_VENDOR_ID_LINKSYS,		0x1032,

		PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
@@ -2700,6 +2701,7 @@ static void rtl8169_down(struct net_device *dev) 
	struct rtl8169_private *tp = netdev_priv(dev);

	void __iomem *ioaddr = tp->mmio_addr;

	unsigned int poll_locked = 0;

	unsigned int intrmask;



	rtl8169_delete_timer(dev);
@@ -2738,8 +2740,11 @@ static void rtl8169_down(struct net_device *dev) 
	 * 2) dev->change_mtu

	 *    -> rtl8169_poll can not be issued again and re-enable the

	 *       interruptions. Let's simply issue the IRQ down sequence again.

	 *

	 * No loop if hotpluged or major error (0xffff).

	 */

	if (RTL_R16(IntrMask))

	intrmask = RTL_R16(IntrMask);

	if (intrmask && (intrmask != 0xffff))

		goto core_down;



	rtl8169_tx_clear(tp);

drivers/net/sb1250-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -2903,7 +2903,7 @@ sbmac_init_module(void) 


		dev = alloc_etherdev(sizeof(struct sbmac_softc));

		if (!dev)

			return -ENOMEM;	/* return ENOMEM */

			return -ENOMEM;



		printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port);