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

Commit 3b8f5945 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6

parents 886d7f44 af667a29

drivers/net/e1000/e1000_main.c

+9 −1
Original line number Diff line number Diff line
@@ -3478,9 +3478,17 @@ static irqreturn_t e1000_intr(int irq, void *data) 
	struct e1000_hw *hw = &adapter->hw;

	u32 icr = er32(ICR);



	if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags)))

	if (unlikely((!icr)))

		return IRQ_NONE;  /* Not our interrupt */



	/*

	 * we might have caused the interrupt, but the above

	 * read cleared it, and just in case the driver is

	 * down there is nothing to do so return handled

	 */

	if (unlikely(test_bit(__E1000_DOWN, &adapter->flags)))

		return IRQ_HANDLED;



	if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {

		hw->get_link_status = 1;

		/* guard against interrupt when we're going down */

drivers/net/e1000e/82571.c

+2 −2
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel PRO/1000 Linux driver

  Copyright(c) 1999 - 2010 Intel Corporation.

  Copyright(c) 1999 - 2011 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -1310,7 +1310,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw) 
		 * apply workaround for hardware errata documented in errata

		 * docs Fixes issue where some error prone or unreliable PCIe

		 * completions are occurring, particularly with ASPM enabled.

		 * Without fix, issue can cause tx timeouts.

		 * Without fix, issue can cause Tx timeouts.

		 */

		reg = er32(GCR2);

		reg |= 1;

drivers/net/e1000e/Makefile

+1 −1
Original line number Diff line number Diff line 
################################################################################

#

# Intel PRO/1000 Linux driver

# Copyright(c) 1999 - 2008 Intel Corporation.

# Copyright(c) 1999 - 2011 Intel Corporation.

#

# This program is free software; you can redistribute it and/or modify it

# under the terms and conditions of the GNU General Public License,

drivers/net/e1000e/defines.h

+1 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel PRO/1000 Linux driver

  Copyright(c) 1999 - 2010 Intel Corporation.

  Copyright(c) 1999 - 2011 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,

drivers/net/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel PRO/1000 Linux driver

  Copyright(c) 1999 - 2010 Intel Corporation.

  Copyright(c) 1999 - 2011 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,