diff options
author | Amit S. Kale <amitkale@netxen.com> | 2006-12-18 08:52:39 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-26 16:45:26 -0500 |
commit | a379cb3c136526617c7aed555a249cb03e951e60 (patch) | |
tree | e75b3cde0b3e0fd3386ea04811670c96cd25932e | |
parent | c75e86b47f97831732fc450fcc5a4230b00071fb (diff) |
NetXen: Multiple adapter fix.
Signed-off-by: Amit S. Kale <amitkale@netxen.com>
netxen_nic.h | 3 +--
netxen_nic_main.c | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/netxen/netxen_nic.h | 3 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index b5410bee5f21..421a07425442 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | #include "netxen_nic_hw.h" | 64 | #include "netxen_nic_hw.h" |
65 | 65 | ||
66 | #define NETXEN_NIC_BUILD_NO "1" | 66 | #define NETXEN_NIC_BUILD_NO "2" |
67 | #define _NETXEN_NIC_LINUX_MAJOR 3 | 67 | #define _NETXEN_NIC_LINUX_MAJOR 3 |
68 | #define _NETXEN_NIC_LINUX_MINOR 3 | 68 | #define _NETXEN_NIC_LINUX_MINOR 3 |
69 | #define _NETXEN_NIC_LINUX_SUBVERSION 2 | 69 | #define _NETXEN_NIC_LINUX_SUBVERSION 2 |
@@ -887,7 +887,6 @@ struct netxen_adapter { | |||
887 | struct netxen_recv_context recv_ctx[MAX_RCV_CTX]; | 887 | struct netxen_recv_context recv_ctx[MAX_RCV_CTX]; |
888 | 888 | ||
889 | int is_up; | 889 | int is_up; |
890 | int number; | ||
891 | struct netxen_dummy_dma dummy_dma; | 890 | struct netxen_dummy_dma dummy_dma; |
892 | 891 | ||
893 | /* Context interface shared between card and host */ | 892 | /* Context interface shared between card and host */ |
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"; | |||
53 | static char netxen_nic_driver_string[] = "NetXen Network Driver version " | 53 | static char netxen_nic_driver_string[] = "NetXen Network Driver version " |
54 | NETXEN_NIC_LINUX_VERSIONID; | 54 | NETXEN_NIC_LINUX_VERSIONID; |
55 | 55 | ||
56 | struct 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) | |||
965 | static void netxen_watchdog(unsigned long v) | 958 | static 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 | } |