Home » Mailing list archives » linux-netdev » 2010 » October » 20

[PATCH -next 1/2] ibmveth: Cleanup error handling inside ibmveth_open

Previous thread: [PATCH 0/9] tproxy: add IPv6 support by KOVACS Krisztian on Wednesday, October 20, 2010 - 4:21 am. (27 messages)

Next thread: [PATCH -next 2/2] ibmveth: Free irq on error path by Denis Kirjanov on Wednesday, October 20, 2010 - 7:21 am. (2 messages)
[view original message]
From: Denis Kirjanov
Subject: [PATCH -next 1/2] ibmveth: Cleanup error handling inside ibmveth_open
Date: Wednesday, October 20, 2010 - 7:21 am

Remove duplicated code in one place.

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
 drivers/net/ibmveth.c |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index b3e157e..2ae8336 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -546,9 +546,8 @@ static int ibmveth_open(struct net_device *netdev)
 	if (!adapter->buffer_list_addr || !adapter->filter_list_addr) {
 		netdev_err(netdev, "unable to allocate filter or buffer list "
 			   "pages\n");
-		ibmveth_cleanup(adapter);
-		napi_disable(&adapter->napi);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto err_out;
 	}
 
 	adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
@@ -558,9 +557,8 @@ static int ibmveth_open(struct net_device *netdev)
 
 	if (!adapter->rx_queue.queue_addr) {
 		netdev_err(netdev, "unable to allocate rx queue pages\n");
-		ibmveth_cleanup(adapter);
-		napi_disable(&adapter->napi);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto err_out;
 	}
 
 	dev = &adapter->vdev->dev;
@@ -578,9 +576,8 @@ static int ibmveth_open(struct net_device *netdev)
 	    (dma_mapping_error(dev, adapter->rx_queue.queue_dma))) {
 		netdev_err(netdev, "unable to map filter or buffer list "
 			   "pages\n");
-		ibmveth_cleanup(adapter);
-		napi_disable(&adapter->napi);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto err_out;
 	}
 
 	adapter->rx_queue.index = 0;
@@ -611,9 +608,8 @@ static int ibmveth_open(struct net_device *netdev)
 				     adapter->filter_list_dma,
 				     rxq_desc.desc,
 				     mac_address);
-		ibmveth_cleanup(adapter);
-		napi_disable(&adapter->napi);
-		return -ENONET;
+		rc = -ENONET;
+		goto err_out;
 	}
 
 	for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
@@ -622,9 +618,8 @@ static int ibmveth_open(struct net_device *netdev)
 		if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[i])) {
 			netdev_err(netdev, "unable to alloc pool\n");
 ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH -next 1/2] ibmveth: Cleanup error handling inside ibmveth_open
Date: Thursday, October 21, 2010 - 1:34 am

From: Denis Kirjanov <dkirjanov@kernel.org>

Applied.
--


[ message continues ]
Previous thread: [PATCH 0/9] tproxy: add IPv6 support by KOVACS Krisztian on Wednesday, October 20, 2010 - 4:21 am. (27 messages)

Next thread: [PATCH -next 2/2] ibmveth: Free irq on error path by Denis Kirjanov on Wednesday, October 20, 2010 - 7:21 am. (2 messages)