diff options
author | Michael Chan <mchan@broadcom.com> | 2012-09-08 02:01:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-10 15:48:20 -0400 |
commit | f81b0ac475f617c93aeb372140b20cae267294c3 (patch) | |
tree | 169fd1ac31ce6f9362a993be2e95376d2b8d5b4c | |
parent | 74dd0c42093e0fd70ca7d901d18c2c01a6fd0fd3 (diff) |
cnic: Free UIO rings when the device is closed.
This will free up unneeded memory.
Reviewed-by: Eddie Wai <eddie.wai@broadcom.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index ff3589405dce..38be4d91783b 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c | |||
@@ -868,6 +868,8 @@ static void cnic_free_resc(struct cnic_dev *dev) | |||
868 | if (udev) { | 868 | if (udev) { |
869 | udev->dev = NULL; | 869 | udev->dev = NULL; |
870 | cp->udev = NULL; | 870 | cp->udev = NULL; |
871 | if (udev->uio_dev == -1) | ||
872 | __cnic_free_uio_rings(udev); | ||
871 | } | 873 | } |
872 | 874 | ||
873 | cnic_free_context(dev); | 875 | cnic_free_context(dev); |
@@ -1039,6 +1041,11 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) | |||
1039 | list_for_each_entry(udev, &cnic_udev_list, list) { | 1041 | list_for_each_entry(udev, &cnic_udev_list, list) { |
1040 | if (udev->pdev == dev->pcidev) { | 1042 | if (udev->pdev == dev->pcidev) { |
1041 | udev->dev = dev; | 1043 | udev->dev = dev; |
1044 | if (__cnic_alloc_uio_rings(udev, pages)) { | ||
1045 | udev->dev = NULL; | ||
1046 | read_unlock(&cnic_dev_lock); | ||
1047 | return -ENOMEM; | ||
1048 | } | ||
1042 | cp->udev = udev; | 1049 | cp->udev = udev; |
1043 | read_unlock(&cnic_dev_lock); | 1050 | read_unlock(&cnic_dev_lock); |
1044 | return 0; | 1051 | return 0; |