ath5k: reset more pointers after we free skbs
authorBruno Randolf <br1@einfach.org>
Wed, 16 Jun 2010 10:11:41 +0000 (19:11 +0900)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 16 Jun 2010 18:59:01 +0000 (14:59 -0400)
After we free skbs for receive or transmit descriptors, make sure we have no
pointers to the now invalid memory address.

Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/base.c

index 6c303d5d46c6d4e4b48f6e4d0ec96a2dd860a1c9..5479f85fcd353ba0c9195bef2c599426a65779e9 100644 (file)
@@ -322,6 +322,8 @@ static inline void ath5k_txbuf_free_skb(struct ath5k_softc *sc,
                        PCI_DMA_TODEVICE);
        dev_kfree_skb_any(bf->skb);
        bf->skb = NULL;
+       bf->skbaddr = 0;
+       bf->desc->ds_data = 0;
 }
 
 static inline void ath5k_rxbuf_free_skb(struct ath5k_softc *sc,
@@ -337,6 +339,8 @@ static inline void ath5k_rxbuf_free_skb(struct ath5k_softc *sc,
                        PCI_DMA_FROMDEVICE);
        dev_kfree_skb_any(bf->skb);
        bf->skb = NULL;
+       bf->skbaddr = 0;
+       bf->desc->ds_data = 0;
 }
 
 
@@ -1455,9 +1459,12 @@ ath5k_desc_free(struct ath5k_softc *sc, struct pci_dev *pdev)
 
        /* Free memory associated with all descriptors */
        pci_free_consistent(pdev, sc->desc_len, sc->desc, sc->desc_daddr);
+       sc->desc = NULL;
+       sc->desc_daddr = 0;
 
        kfree(sc->bufptr);
        sc->bufptr = NULL;
+       sc->bbuf = NULL;
 }