diff options
| author | mike.rapoport@gmail.com | 2010-10-13 00:09:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-14 21:29:56 +0200 |
| commit | 182acb3ca59ba2d31485f7225177c069cebdc161 (patch) | |
| tree | b0bd77c9c3c377d642c338bf825146f78a198b24 /drivers/staging/brcm80211/brcmfmac/dhd_linux.c | |
| parent | staging: brcm80211: remove unused NATIVE_{MALLOC,MFREE} (diff) | |
| download | kernel-qcow2-linux-182acb3ca59ba2d31485f7225177c069cebdc161.tar.gz kernel-qcow2-linux-182acb3ca59ba2d31485f7225177c069cebdc161.tar.xz kernel-qcow2-linux-182acb3ca59ba2d31485f7225177c069cebdc161.zip | |
staging: brcm80211: replace MFREE with kfree
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/dhd_linux.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index e37ed4b13340..a3e9ca8e6e88 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -747,7 +747,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) allmulti = cnt ? true : allmulti; } - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); /* Now send the allmulti setting. This is based on the setting in the * net_device flags, but might be modified above to be turned on if we @@ -768,7 +768,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) DHD_ERROR(("%s: mkiovar failed for allmulti, datalen %d " "buflen %u\n", dhd_ifname(&dhd->pub, ifidx), (int)sizeof(allmulti), buflen)); - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); return; } @@ -784,7 +784,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) dhd_ifname(&dhd->pub, ifidx), ltoh32(allmulti))); } - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); /* Finally, pick up the PROMISC flag as well, like the NIC driver does */ @@ -921,7 +921,7 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); dhd->iflist[ifp->idx] = NULL; - MFREE(dhd->pub.osh, ifp, sizeof(*ifp)); + kfree(ifp); #ifdef SOFTAP if (ifp->net == ap_net_dev) ap_net_dev = NULL; /* NULL SOFTAP global @@ -1746,7 +1746,7 @@ done: } if (buf) - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); return OSL_ERROR(bcmerror); } @@ -2374,8 +2374,8 @@ void dhd_detach(dhd_pub_t *dhdp) WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_LINK_DOWN_TMOUT); WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_PNO_FIND_TMOUT); free_netdev(ifp->net); - MFREE(dhd->pub.osh, ifp, sizeof(*ifp)); - MFREE(dhd->pub.osh, dhd, sizeof(*dhd)); + kfree(ifp); + kfree(dhd); } } } @@ -2923,7 +2923,7 @@ int write_to_file(dhd_pub_t *dhd, u8 *buf, int size) exit: /* free buf before return */ - MFREE(dhd->osh, buf, size); + kfree(buf); /* close file before return */ if (fp) filp_close(fp, current->files); |