summaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorDhananjay Phadke2008-06-16 07:59:44 +0200
committerJeff Garzik2008-06-18 05:06:59 +0200
commit3276fbad8385d8e86d85fad4d86dae669a045c65 (patch)
treedffa1ece415eb7871df54d1e7852394616dca39b /drivers/net/netxen/netxen_nic_main.c
parentnetxen: fix portnum for hp mezz cards (diff)
downloadkernel-qcow2-linux-3276fbad8385d8e86d85fad4d86dae669a045c65.tar.gz
kernel-qcow2-linux-3276fbad8385d8e86d85fad4d86dae669a045c65.tar.xz
kernel-qcow2-linux-3276fbad8385d8e86d85fad4d86dae669a045c65.zip
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.c4
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);
static irqreturn_t netxen_intr(int irq, void *data);
static irqreturn_t netxen_msi_intr(int irq, void *data);
-int physical_port[] = {0, 1, 2, 3};
-
/* PCI Device ID Table */
static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
{PCI_DEVICE(0x4040, 0x0001)},
@@ -647,7 +645,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
i = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_V2P(adapter->portnum)));
if (i != 0x55555555)
- physical_port[adapter->portnum] = i;
+ adapter->physical_port = i;
netif_carrier_off(netdev);
netif_stop_queue(netdev);