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

Commit 5325a7bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents e70049b9 028e1415

drivers/net/netxen/netxen_nic_main.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -588,7 +588,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		adapter->pci_mem_read = netxen_nic_pci_mem_read_2M;

		adapter->pci_mem_read = netxen_nic_pci_mem_read_2M;

		adapter->pci_mem_write = netxen_nic_pci_mem_write_2M;

		adapter->pci_mem_write = netxen_nic_pci_mem_write_2M;





		mem_ptr0 = ioremap(mem_base, mem_len);

		mem_ptr0 = pci_ioremap_bar(pdev, 0);

		if (mem_ptr0 == NULL) {

			dev_err(&pdev->dev, "failed to map PCI bar 0\n");

			return -EIO;

		}



		pci_len0 = mem_len;

		pci_len0 = mem_len;

		first_page_group_start = 0;

		first_page_group_start = 0;

		first_page_group_end   = 0;

		first_page_group_end   = 0;
@@ -796,9 +801,12 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * See if the firmware gave us a virtual-physical port mapping.

	 * See if the firmware gave us a virtual-physical port mapping.

	 */

	 */

	adapter->physical_port = adapter->portnum;

	adapter->physical_port = adapter->portnum;

	i = adapter->pci_read_normalize(adapter, CRB_V2P(adapter->portnum));

	if (adapter->fw_major < 4) {

		i = adapter->pci_read_normalize(adapter,

				CRB_V2P(adapter->portnum));

		if (i != 0x55555555)

		if (i != 0x55555555)

			adapter->physical_port = i;

			adapter->physical_port = i;

	}





	adapter->flags &= ~(NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED);

	adapter->flags &= ~(NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED);