aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index f2b3fbc593c6..926ead774f58 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -53,8 +53,6 @@ char netxen_nic_driver_name[] = "netxen-nic";
53static char netxen_nic_driver_string[] = "NetXen Network Driver version " 53static char netxen_nic_driver_string[] = "NetXen Network Driver version "
54 NETXEN_NIC_LINUX_VERSIONID; 54 NETXEN_NIC_LINUX_VERSIONID;
55 55
56struct netxen_adapter *g_adapter = NULL;
57
58#define NETXEN_NETDEV_WEIGHT 120 56#define NETXEN_NETDEV_WEIGHT 120
59#define NETXEN_ADAPTER_UP_MAGIC 777 57#define NETXEN_ADAPTER_UP_MAGIC 777
60#define NETXEN_NIC_PEG_TUNE 0 58#define NETXEN_NIC_PEG_TUNE 0
@@ -131,7 +129,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
131 struct netxen_cmd_buffer *cmd_buf_arr = NULL; 129 struct netxen_cmd_buffer *cmd_buf_arr = NULL;
132 u64 mac_addr[FLASH_NUM_PORTS + 1]; 130 u64 mac_addr[FLASH_NUM_PORTS + 1];
133 int valid_mac = 0; 131 int valid_mac = 0;
134 static int netxen_cards_found = 0;
135 132
136 printk(KERN_INFO "%s \n", netxen_nic_driver_string); 133 printk(KERN_INFO "%s \n", netxen_nic_driver_string);
137 /* In current scheme, we use only PCI function 0 */ 134 /* In current scheme, we use only PCI function 0 */
@@ -222,9 +219,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
222 goto err_out_dbunmap; 219 goto err_out_dbunmap;
223 } 220 }
224 221
225 if (netxen_cards_found == 0) {
226 g_adapter = adapter;
227 }
228 adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS; 222 adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS;
229 adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS; 223 adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS;
230 adapter->max_jumbo_rx_desc_count = MAX_JUMBO_RCV_DESCRIPTORS; 224 adapter->max_jumbo_rx_desc_count = MAX_JUMBO_RCV_DESCRIPTORS;
@@ -468,7 +462,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
468 break; 462 break;
469 } 463 }
470 464
471 adapter->number = netxen_cards_found;
472 adapter->driver_mismatch = 0; 465 adapter->driver_mismatch = 0;
473 466
474 return 0; 467 return 0;
@@ -965,11 +958,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
965static void netxen_watchdog(unsigned long v) 958static void netxen_watchdog(unsigned long v)
966{ 959{
967 struct netxen_adapter *adapter = (struct netxen_adapter *)v; 960 struct netxen_adapter *adapter = (struct netxen_adapter *)v;
968 if (adapter != g_adapter) {
969 printk("%s: ***BUG*** adapter[%p] != g_adapter[%p]\n",
970 __FUNCTION__, adapter, g_adapter);
971 return;
972 }
973 961
974 SCHEDULE_WORK(&adapter->watchdog_task); 962 SCHEDULE_WORK(&adapter->watchdog_task);
975} 963}