[PATCH] bcm43xx: Fix crash on ifdown, by being careful in pio/dma freeing.

This bug was caused by the packing of the bcm43xx_dma and bcm43xx_pio
structures into a union.

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index 7ed368a587f3bd1516be236fd78d92a338f06ed9..9c64438b767f5df04f76fc4a63297f1118088fd8 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -531,7 +531,11 @@ static void bcm43xx_destroy_dmaring(struct bcm43xx_dmaring *ring)
 
 void bcm43xx_dma_free(struct bcm43xx_private *bcm)
 {
-       struct bcm43xx_dma *dma = bcm43xx_current_dma(bcm);
+       struct bcm43xx_dma *dma;
+
+       if (bcm43xx_using_pio(bcm))
+               return;
+       dma = bcm43xx_current_dma(bcm);
 
        bcm43xx_destroy_dmaring(dma->rx_ring1);
        dma->rx_ring1 = NULL;

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
index 7bddae910de91cb69006fb3b85a066a6dbdb8a0b..5b6f0a84d017182ecc6c6e0420e959351c0a7595 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
@@ -377,7 +377,11 @@ static void bcm43xx_destroy_pioqueue(struct bcm43xx_pioqueue *queue)
 
 void bcm43xx_pio_free(struct bcm43xx_private *bcm)
 {
-       struct bcm43xx_pio *pio = bcm43xx_current_pio(bcm);
+       struct bcm43xx_pio *pio;
+
+       if (!bcm43xx_using_pio(bcm))
+               return;
+       pio = bcm43xx_current_pio(bcm);
 
        bcm43xx_destroy_pioqueue(pio->queue3);
        pio->queue3 = NULL;