[PATCH 9/9] UML - Free network IRQ correctly

From: Jeff Dike
Date: Wed Jan 04 2006 - 16:02:00 EST


Free the network IRQ when closing down the network devices at shutdown.
Delete the device from the opened devices list on close.
These prevent an -EBADF when later disabling SIGIO on all extant
descriptors and a complaint from free_irq about freeing the IRQ twice.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

Index: linux-2.6.15/arch/um/drivers/net_kern.c
===================================================================
--- linux-2.6.15.orig/arch/um/drivers/net_kern.c 2006-01-03 17:29:31.000000000 -0500
+++ linux-2.6.15/arch/um/drivers/net_kern.c 2006-01-04 14:57:58.000000000 -0500
@@ -150,6 +150,7 @@ static int uml_net_close(struct net_devi
if(lp->close != NULL)
(*lp->close)(lp->fd, &lp->user);
lp->fd = -1;
+ list_del(&lp->list);

spin_unlock(&lp->lock);
return 0;
@@ -715,6 +716,7 @@ static void close_devices(void)

list_for_each(ele, &opened){
lp = list_entry(ele, struct uml_net_private, list);
+ free_irq(lp->dev->irq, lp->dev);
if((lp->close != NULL) && (lp->fd >= 0))
(*lp->close)(lp->fd, &lp->user);
if(lp->remove != NULL) (*lp->remove)(&lp->user);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/