On Thu, May 29, 2008 at 11:35 AM, Zhu Yi <yi.zhu@xxxxxxxxx> wrote: > From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > > This patch fixes a memory leak that the scan buffer isn't released > on exit. > > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-core.c | 1 + > drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c > index c9bbfbb..61716ba 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.c > +++ b/drivers/net/wireless/iwlwifi/iwl-core.c > @@ -911,6 +911,7 @@ void iwl_uninit_drv(struct iwl_priv *priv) > iwl_free_calib_results(priv); > iwlcore_free_geos(priv); > iwl_free_channel_map(priv); > + kfree(priv->scan); > } > EXPORT_SYMBOL(iwl_uninit_drv); > > diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c > index 244bfe5..72279e0 100644 > --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c > +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c > @@ -8257,7 +8257,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) > > iwl3945_free_channel_map(priv); > iwl3945_free_geos(priv); > - > + kfree(priv->scan); > if (priv->ibss_beacon) > dev_kfree_skb(priv->ibss_beacon); > > -- > 1.5.3.6 > This one is also for 2.6.26 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
