[PATCH 0/3] netxen bug fixes

[PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Set of 3 patch fixes including a sparse warning cleanup.
Please apply.

Thanks,
Dhananjay

Re: [PATCH 0/3] netxen bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Mon, 16 Feb 2009 01:18:48 -0800

> Set of 3 patch fixes including a sparse warning cleanup.
> Please apply.

These are not bug fixes.  I'm applying them to net-next-2.6

RE: [PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Alright, thanks.
________________________________________
From: David Miller [davem@davemloft.net]
Sent: Tuesday, February 17, 2009 8:25 PM
To: Dhananjay Phadke
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH 0/3] netxen bug fixes

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Mon, 16 Feb 2009 01:18:48 -0800

> Set of 3 patch fixes including a sparse warning cleanup.
> Please apply.

These are not bug fixes.  I'm applying them to net-next-2.6

[PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Dave,

Set of 3 critical bug fixes for 2.6.31, including a fix for
intermittant deadlock on dev close.

Please apply.

Thanks,
	Dhananjay

Re: [PATCH 0/3] netxen bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Fri, 17 Jul 2009 18:27:05 -0700

> Set of 3 critical bug fixes for 2.6.31, including a fix for
> intermittant deadlock on dev close.

Applied, thanks.

[PATCH 0/3] netxen: bug fixes

[Dhananjay Phadke]

Dave,

3 bug fixes for 2.6.32. Please apply to net-2.6.

Thanks,
	Dhananjay

Re: [PATCH 0/3] netxen: bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Wed, 21 Oct 2009 22:39:00 -0700

> 3 bug fixes for 2.6.32. Please apply to net-2.6.

All applied, thank you.

[PATCH 0/3]netxen: bug fixes

[Amit Kumar Salecha]

Hi
   Sending series of 3 bug fixes. Please apply them on net-2.6.

-Amit

[PATCH 1/3] netxen: fix memory leaks in error path

[Amit Kumar Salecha]

Fixes memory leak in error path when memory allocation
for adapter data structures fails.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_ctx.c  |    3 ++-
 drivers/net/netxen/netxen_nic_init.c |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index f26e547..3a41b6a 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -629,7 +629,8 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
 	if (addr == NULL) {
 		dev_err(&pdev->dev, "%s: failed to allocate tx desc ring\n",
 				netdev->name);
-		return -ENOMEM;
+		err = -ENOMEM;
+		goto err_out_free;
 	}
 
 	tx_ring->desc_head = (struct cmd_desc_type0 *)addr;
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 045a7c8..e08527f 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -218,7 +218,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
 	if (cmd_buf_arr == NULL) {
 		dev_err(&pdev->dev, "%s: failed to allocate cmd buffer ring\n",
 		       netdev->name);
-		return -ENOMEM;
+		goto err_out;
 	}
 	memset(cmd_buf_arr, 0, TX_BUFF_RINGSIZE(tx_ring));
 	tx_ring->cmd_buf_arr = cmd_buf_arr;
@@ -230,7 +230,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
 	if (rds_ring == NULL) {
 		dev_err(&pdev->dev, "%s: failed to allocate rds ring struct\n",
 		       netdev->name);
-		return -ENOMEM;
+		goto err_out;
 	}
 	recv_ctx->rds_rings = rds_ring;
 
-- 
1.6.0.2

[PATCH 2/3] netxen: fix rcv buffer leak

[Amit Kumar Salecha]

Rcv producer should be read in spin-lock.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_init.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index e08527f..c865dda 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1805,9 +1805,10 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,
 	netxen_ctx_msg msg = 0;
 	struct list_head *head;
 
+	spin_lock(&rds_ring->lock);
+
 	producer = rds_ring->producer;
 
-	spin_lock(&rds_ring->lock);
 	head = &rds_ring->free_list;
 	while (!list_empty(head)) {
 
@@ -1829,7 +1830,6 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,
 
 		producer = get_next_index(producer, rds_ring->num_desc);
 	}
-	spin_unlock(&rds_ring->lock);
 
 	if (count) {
 		rds_ring->producer = producer;
@@ -1853,6 +1853,8 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,
 					NETXEN_RCV_PRODUCER_OFFSET), msg);
 		}
 	}
+
+	spin_unlock(&rds_ring->lock);
 }
 
 static void
@@ -1864,10 +1866,11 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
 	int producer, count = 0;
 	struct list_head *head;
 
-	producer = rds_ring->producer;
 	if (!spin_trylock(&rds_ring->lock))
 		return;
 
+	producer = rds_ring->producer;
+
 	head = &rds_ring->free_list;
 	while (!list_empty(head)) {
 
-- 
1.6.0.2

[PATCH 3/3] netxen: fix caching window register

[Amit Kumar Salecha]

CRB window register is not per pci-func for NX3031,
so caching can result in incorrect values.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_hw.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 5c496f8..29d7b93 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1159,9 +1159,6 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong off)
 
 	window = CRB_HI(off);
 
-	if (adapter->ahw.crb_win == window)
-		return;
-
 	writel(window, addr);
 	if (readl(addr) != window) {
 		if (printk_ratelimit())
@@ -1169,7 +1166,6 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong off)
 				"failed to set CRB window to %d off 0x%lx\n",
 				window, off);
 	}
-	adapter->ahw.crb_win = window;
 }
 
 static void __iomem *
-- 
1.6.0.2

Re: [PATCH 0/3]netxen: bug fixes

[David Miller]

From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 14 Jun 2010 02:39:02 -0700

>    Sending series of 3 bug fixes. Please apply them on net-2.6.

All applied, thanks.