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

Commit b9b6e78b authored by Auke Kok's avatar Auke Kok Committed by Auke Kok
Browse files

e1000: fix ethtool test irq alloc as "probe" 



New code added in 2.6.17 caused setup_irq to print a warning when
running ethtool -t eth0 offline.

This test marks the request_irq call made by this test as a "probe"
to see if the interrupt is shared or not.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent e82b0f2c

drivers/net/e1000/e1000_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -870,13 +870,16 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) 
	*data = 0;



	/* Hook up test interrupt handler just for this test */

 	if (!request_irq(irq, &e1000_test_intr, 0, netdev->name, netdev)) {

	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,

	                 netdev)) {

 		shared_int = FALSE;

 	} else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,

			      netdev->name, netdev)){

		*data = 1;

		return -1;

	}

	DPRINTK(PROBE,INFO, "testing %s interrupt\n",

	        (shared_int ? "shared" : "unshared"));



	/* Disable all the interrupts */

	E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF);