diff options
author | Mithlesh Thukral <mithlesh@netxen.com> | 2007-04-20 10:53:52 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:01:05 -0400 |
commit | 595e3fb8cf0c3c1c6d63dc3d7fd166e50bf150ff (patch) | |
tree | db94c0f9fe01a2a34eeae896d502689e2de83118 /drivers/net/netxen/netxen_nic_init.c | |
parent | 13ba9c7714cfa40821d29090442de14d01d6eb33 (diff) |
NetXen: Multi PCI support for Quad cards
NetXen: Fix the multi PCI function for cards with more than 2 ports.
This patch fixes the working of multi PCI capable driver on cards with
more than 2 ports by adding the addresses for their rings and sizes.
Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index e625d3c496d1..2a3a91d2c389 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
@@ -226,7 +226,6 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) | |||
226 | adapter->unset_promisc = netxen_niu_set_promiscuous_mode; | 226 | adapter->unset_promisc = netxen_niu_set_promiscuous_mode; |
227 | adapter->phy_read = netxen_niu_gbe_phy_read; | 227 | adapter->phy_read = netxen_niu_gbe_phy_read; |
228 | adapter->phy_write = netxen_niu_gbe_phy_write; | 228 | adapter->phy_write = netxen_niu_gbe_phy_write; |
229 | adapter->init_port = netxen_niu_gbe_init_port; | ||
230 | adapter->init_niu = netxen_nic_init_niu_gb; | 229 | adapter->init_niu = netxen_nic_init_niu_gb; |
231 | adapter->stop_port = netxen_niu_disable_gbe_port; | 230 | adapter->stop_port = netxen_niu_disable_gbe_port; |
232 | break; | 231 | break; |
@@ -438,7 +437,6 @@ do_rom_fast_read_words(struct netxen_adapter *adapter, int addr, | |||
438 | 437 | ||
439 | for (addridx = addr; addridx < (addr + size); addridx += 4) { | 438 | for (addridx = addr; addridx < (addr + size); addridx += 4) { |
440 | ret = do_rom_fast_read(adapter, addridx, (int *)bytes); | 439 | ret = do_rom_fast_read(adapter, addridx, (int *)bytes); |
441 | *(int *)bytes = cpu_to_le32(*(int *)bytes); | ||
442 | if (ret != 0) | 440 | if (ret != 0) |
443 | break; | 441 | break; |
444 | bytes += 4; | 442 | bytes += 4; |
@@ -498,7 +496,7 @@ static inline int do_rom_fast_write_words(struct netxen_adapter *adapter, | |||
498 | int timeout = 0; | 496 | int timeout = 0; |
499 | int data; | 497 | int data; |
500 | 498 | ||
501 | data = le32_to_cpu((*(u32*)bytes)); | 499 | data = *(u32*)bytes; |
502 | 500 | ||
503 | ret = do_rom_fast_write(adapter, addridx, data); | 501 | ret = do_rom_fast_write(adapter, addridx, data); |
504 | if (ret < 0) | 502 | if (ret < 0) |