diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2008-06-16 01:59:44 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-17 23:06:59 -0400 |
commit | 3276fbad8385d8e86d85fad4d86dae669a045c65 (patch) | |
tree | dffa1ece415eb7871df54d1e7852394616dca39b /drivers/net/netxen/netxen_nic_main.c | |
parent | dc515f2e0b356981ea0c4581ff0e587aea8b624a (diff) |
netxen: remove global physical_port array
Store physical port number in netxen_adapter structure.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 5a2fd214fefe..f903de0fe9ea 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -70,8 +70,6 @@ static void netxen_nic_poll_controller(struct net_device *netdev); | |||
70 | static irqreturn_t netxen_intr(int irq, void *data); | 70 | static irqreturn_t netxen_intr(int irq, void *data); |
71 | static irqreturn_t netxen_msi_intr(int irq, void *data); | 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); |
72 | 72 | ||
73 | int physical_port[] = {0, 1, 2, 3}; | ||
74 | |||
75 | /* PCI Device ID Table */ | 73 | /* PCI Device ID Table */ |
76 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { | 74 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { |
77 | {PCI_DEVICE(0x4040, 0x0001)}, | 75 | {PCI_DEVICE(0x4040, 0x0001)}, |
@@ -647,7 +645,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
647 | */ | 645 | */ |
648 | i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum))); | 646 | i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum))); |
649 | if (i != 0x55555555) | 647 | if (i != 0x55555555) |
650 | physical_port[adapter->portnum] = i; | 648 | adapter->physical_port = i; |
651 | 649 | ||
652 | netif_carrier_off(netdev); | 650 | netif_carrier_off(netdev); |
653 | netif_stop_queue(netdev); | 651 | netif_stop_queue(netdev); |