openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cnic: Add cnic_free_uio() 

to free all UIO related structures.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2010-10-13 14:06:48 +00:00 committed by David S. Miller
parent fdf24086f4
commit c06c046225
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/cnic.c
View File

@ -770,20 +770,15 @@ static void cnic_free_context(struct cnic_dev *dev)
}
}
static void cnic_free_resc(struct cnic_dev *dev)
static void __cnic_free_uio(struct cnic_dev *dev)
{
struct cnic_local *cp = dev->cnic_priv;
int i = 0;
if (cp->cnic_uinfo) {
while (cp->uio_dev != -1 && i < 15) {
msleep(100);
i++;
}
if (cp->cnic_uinfo)
uio_unregister_device(cp->cnic_uinfo);
kfree(cp->cnic_uinfo);
cp->cnic_uinfo = NULL;
}
kfree(cp->cnic_uinfo);
cp->cnic_uinfo = NULL;
if (cp->l2_buf) {
dma_free_coherent(&dev->pcidev->dev, cp->l2_buf_size,
@ -796,6 +791,28 @@ static void cnic_free_resc(struct cnic_dev *dev)
cp->l2_ring, cp->l2_ring_map);
cp->l2_ring = NULL;
}
}
static void cnic_free_uio(struct cnic_dev *dev)
{
if (!dev)
return;
__cnic_free_uio(dev);
}
static void cnic_free_resc(struct cnic_dev *dev)
{
struct cnic_local *cp = dev->cnic_priv;
int i = 0;
if (cp->cnic_uinfo) {
while (cp->uio_dev != -1 && i < 15) {
msleep(100);
i++;
}
cnic_free_uio(dev);
}
cnic_free_context(dev);
kfree(cp->ctx_arr);