Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 30 insertions, 12 deletions

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 66e0323c1839..b74a0eadbd6c 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -380,6 +380,12 @@ out:
     return retval;
 }
 
+static irqreturn_t el2_probe_interrupt(int irq, void *seen)
+{
+        *(bool *)seen = true;
+        return IRQ_HANDLED;
+}
+
 static int
 el2_open(struct net_device *dev)
 {
@@ -391,23 +397,35 @@ el2_open(struct net_device *dev)
 
         outb(EGACFR_NORM, E33G_GACFR);  /* Enable RAM and interrupts. */
         do {
-            retval = request_irq(*irqp, NULL, 0, "bogus", dev);
-            if (retval >= 0) {
+                bool seen;
+
+                retval = request_irq(*irqp, el2_probe_interrupt, 0,
+                                     dev->name, &seen);
+                if (retval == -EBUSY)
+                        continue;
+                if (retval < 0)
+                        goto err_disable;
+
                 /* Twinkle the interrupt, and check if it's seen. */
-                unsigned long cookie = probe_irq_on();
+                seen = false;
+                smp_wmb();
                 outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR);
                 outb_p(0x00, E33G_IDCFR);
-                if (*irqp == probe_irq_off(cookie) &&   /* It's a good IRQ line! */
-                    ((retval = request_irq(dev->irq = *irqp,
-                                           eip_interrupt, 0,
-                                           dev->name, dev)) == 0))
-                    break;
-            } else {
-                    if (retval != -EBUSY)
-                            return retval;
-            }
+                msleep(1);
+                free_irq(*irqp, el2_probe_interrupt);
+                if (!seen)
+                        continue;
+
+                retval = request_irq(dev->irq = *irqp, eip_interrupt, 0,
+                                     dev->name, dev);
+                if (retval == -EBUSY)
+                        continue;
+                if (retval < 0)
+                        goto err_disable;
         } while (*++irqp);
+
         if (*irqp == 0) {
+        err_disable:
             outb(EGACFR_IRQOFF, E33G_GACFR);    /* disable interrupts. */
             return -EAGAIN;
         }