Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abcea859 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netxen: include ipv6.h (fixes build failure)
  netxen: avoid invalid iounmap
parents 4b48d9d4 00977784

drivers/net/netxen/netxen_nic_main.c

+5 −2
Original line number Diff line number Diff line
@@ -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");
@@ -1004,7 +1005,9 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) 


	iounmap(adapter->ahw.db_base);

	iounmap(adapter->ahw.pci_base0);

	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);