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: Jesse Brandeburg [EMAIL PROTECTED]
Signed-off-by: Auke Kok [EMAIL PROTECTED]
---
Jeff,
Because upstream and upstream-fixes have a whitespace conflict in them, I've
prepared two separate git branches to pull from so that a subsequent pull or
merge from upstream-fixes into upstream doesn't resolve into a conflict:
please pull from our git-server:
into upstream:
git-pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream
into upstream-fixes:
git-pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream-fixes
Cheers,
Auke
---
e1000_ethtool.c |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
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: Jesse Brandeburg [EMAIL PROTECTED]
Signed-off-by: Auke Kok [EMAIL PROTECTED]
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index ea3..d1c705b 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -870,13 +870,16 @@ e1000_intr_test(struct e1000_adapter *ad
*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, 0x);
