[PATCH 0/2] netxen fixes

[PATCH 0/2] netxen fixes

[Dhananjay Phadke]

One to fix build error when IPV6 is unset, other to fix a warning
on ppc64.

[PATCH 1/2] netxen: avoid invalid iounmap

[Dhananjay Phadke]

For NX3031 only one I/O range is mapped, so unmapping other
two which are used by older chips, causes this warning on
ppc64.

"Attempt to iounmap early bolted mapping at 0x0000000000000000"

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 8686740..f8e2629 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1004,8 +1004,10 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
 	iounmap(adapter->ahw.db_base);
 	iounmap(adapter->ahw.pci_base0);
-	iounmap(adapter->ahw.pci_base1);
-	iounmap(adapter->ahw.pci_base2);
+	if (adapter->ahw.pci_base1 != NULL)
+		iounmap(adapter->ahw.pci_base1);
+	if (adapter->ahw.pci_base2 != NULL)
+		iounmap(adapter->ahw.pci_base2);
 
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
-- 
1.6.0.2

[PATCH 2/2] netxen: include ipv6.h (fixes build failure)

[Dhananjay Phadke]

Fixes a build error in absence of CONFIG_IPV6:

drivers/net/netxen/netxen_nic_main.c:1189: error: implicit declaration of function 'ipv6_hdr'
drivers/net/netxen/netxen_nic_main.c:1189: error: invalid type argument of '->'

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index f8e2629..d854f07 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -41,6 +41,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
+#include <linux/ipv6.h>
 
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
-- 
1.6.0.2

Re: [PATCH 1/2] netxen: avoid invalid iounmap

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Fri, 16 Jan 2009 10:28:03 -0800

> For NX3031 only one I/O range is mapped, so unmapping other
> two which are used by older chips, causes this warning on
> ppc64.
> 
> "Attempt to iounmap early bolted mapping at 0x0000000000000000"
> 
> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>

Applied.

Re: [PATCH 2/2] netxen: include ipv6.h (fixes build failure)

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Fri, 16 Jan 2009 10:28:04 -0800

> Fixes a build error in absence of CONFIG_IPV6:
> 
> drivers/net/netxen/netxen_nic_main.c:1189: error: implicit declaration of function 'ipv6_hdr'
> drivers/net/netxen/netxen_nic_main.c:1189: error: invalid type argument of '->'
> 
> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>

Gee, thanks for not even mentioning Ingo having reported this problem
in your commit message. :-((

I've fixed this when committing.

You didn't even CC: him on this patch posting, what gives?

RE: [PATCH 2/2] netxen: include ipv6.h (fixes build failure)

[Dhananjay Phadke]

My bad, I copy-pasted the --to --cc list to git command line and missed out the original Sender in that email.

Double apologies to Ingo, first for introducing the build error and other for fixing without credit to reporter :-(.

Thanks Ingo, Dave.

-Dhananjay

-----Original Message-----
From: David Miller [mailto:davem@davemloft.net]
Sent: Friday, January 16, 2009 11:05
To: Dhananjay Phadke
Cc: netdev@vger.kernel.org; akpm@linux-foundation.org; linux-kernel@vger.kernel.org; mingo@elte.hu
Subject: Re: [PATCH 2/2] netxen: include ipv6.h (fixes build failure)

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Fri, 16 Jan 2009 10:28:04 -0800

> Fixes a build error in absence of CONFIG_IPV6:
>
> drivers/net/netxen/netxen_nic_main.c:1189: error: implicit declaration of function 'ipv6_hdr'
> drivers/net/netxen/netxen_nic_main.c:1189: error: invalid type argument of '->'
>
> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>

Gee, thanks for not even mentioning Ingo having reported this problem
in your commit message. :-((

I've fixed this when committing.

You didn't even CC: him on this patch posting, what gives?


No virus found in this incoming message.
Checked by AVG.
Version: 7.5.526 / Virus Database: 270.10.6/1889 - Release Date: 1/12/2009 20:18


No virus found in this outgoing message.
Checked by AVG.
Version: 7.5.526 / Virus Database: 270.10.6/1889 - Release Date: 1/12/2009 20:18