cnic: Put rx/tx ring allocation in separate function.

This will allow the 10G iSCSI code to reuse the function.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4869d77cbe91dc9fde5cee6b82babc8f50517ff7..039900c416993742cdc824671d08b1f6a05eea7d 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -742,6 +742,26 @@ static int cnic_alloc_context(struct cnic_dev *dev)
        return 0;
 }
 
+static int cnic_alloc_l2_rings(struct cnic_dev *dev, int pages)
+{
+       struct cnic_local *cp = dev->cnic_priv;
+
+       cp->l2_ring_size = pages * BCM_PAGE_SIZE;
+       cp->l2_ring = pci_alloc_consistent(dev->pcidev, cp->l2_ring_size,
+                                          &cp->l2_ring_map);
+       if (!cp->l2_ring)
+               return -ENOMEM;
+
+       cp->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size;
+       cp->l2_buf_size = PAGE_ALIGN(cp->l2_buf_size);
+       cp->l2_buf = pci_alloc_consistent(dev->pcidev, cp->l2_buf_size,
+                                          &cp->l2_buf_map);
+       if (!cp->l2_buf)
+               return -ENOMEM;
+
+       return 0;
+}
+
 static int cnic_alloc_bnx2_resc(struct cnic_dev *dev)
 {
        struct cnic_local *cp = dev->cnic_priv;
@@ -762,17 +782,8 @@ static int cnic_alloc_bnx2_resc(struct cnic_dev *dev)
        if (ret)
                goto error;
 
-       cp->l2_ring_size = 2 * BCM_PAGE_SIZE;
-       cp->l2_ring = pci_alloc_consistent(dev->pcidev, cp->l2_ring_size,
-                                          &cp->l2_ring_map);
-       if (!cp->l2_ring)
-               goto error;
-
-       cp->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size;
-       cp->l2_buf_size = PAGE_ALIGN(cp->l2_buf_size);
-       cp->l2_buf = pci_alloc_consistent(dev->pcidev, cp->l2_buf_size,
-                                          &cp->l2_buf_map);
-       if (!cp->l2_buf)
+       ret = cnic_alloc_l2_rings(dev, 2);
+       if (ret)
                goto error;
 
        uinfo = kzalloc(sizeof(*uinfo), GFP_ATOMIC);