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

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

Revert "e1000: fix shared interrupt warning message" 



This reverts commit d2ed1635.

As Thomas Gleixner reports:
  "e1000 is not working anymore. ifup fails permanentely.
    ADDRCONF(NETDEV_UP): eth0: link is not ready
   nothing else"

The broken commit was identified with "git bisect".

Auke Kok says:
  "I think we need to drop this now.  The report that says that this
   *fixes* something might have been on regular interrupts only.  I
   currently suspect that it breaks all MSI interrupts, which would make
   sense if I look a the code.  Very bad indeed."

Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5fc7e655

drivers/net/e1000/e1000_main.c

+6 −6
Original line number Diff line number Diff line
@@ -1417,6 +1417,10 @@ e1000_open(struct net_device *netdev) 
	if ((err = e1000_setup_all_rx_resources(adapter)))

		goto err_setup_rx;



	err = e1000_request_irq(adapter);

	if (err)

		goto err_req_irq;



	e1000_power_up_phy(adapter);



	if ((err = e1000_up(adapter)))
@@ -1427,10 +1431,6 @@ e1000_open(struct net_device *netdev) 
		e1000_update_mng_vlan(adapter);

	}



	err = e1000_request_irq(adapter);

	if (err)

		goto err_req_irq;



	/* If AMT is enabled, let the firmware know that the network

	 * interface is now open */

	if (adapter->hw.mac_type == e1000_82573 &&
@@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev) 


	return E1000_SUCCESS;



err_req_irq:

	e1000_down(adapter);

err_up:

	e1000_power_down_phy(adapter);

	e1000_free_irq(adapter);

err_req_irq:

	e1000_free_all_rx_resources(adapter);

err_setup_rx:

	e1000_free_all_tx_resources(adapter);