diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2008-06-16 01:59:43 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-17 23:06:58 -0400 |
commit | dc515f2e0b356981ea0c4581ff0e587aea8b624a (patch) | |
tree | fa24f2d27a4234fea678dcc9fae530f090ecd905 /drivers/net/netxen | |
parent | 8b8091fbf4d8791ad70b146ba2c892c62c2cdc6b (diff) |
netxen: fix portnum for hp mezz cards
This fixes a the issue where logical port number is set incorrectly
for HP blade mezz cards.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7144c255ce54..5a2fd214fefe 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -530,9 +530,15 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
530 | netxen_initialize_adapter_sw(adapter); /* initialize the buffers in adapter */ | 530 | netxen_initialize_adapter_sw(adapter); /* initialize the buffers in adapter */ |
531 | 531 | ||
532 | /* Mezz cards have PCI function 0,2,3 enabled */ | 532 | /* Mezz cards have PCI function 0,2,3 enabled */ |
533 | if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) | 533 | switch (adapter->ahw.boardcfg.board_type) { |
534 | && (pci_func_id >= 2)) | 534 | case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ: |
535 | case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ: | ||
536 | if (pci_func_id >= 2) | ||
535 | adapter->portnum = pci_func_id - 2; | 537 | adapter->portnum = pci_func_id - 2; |
538 | break; | ||
539 | default: | ||
540 | break; | ||
541 | } | ||
536 | 542 | ||
537 | #ifdef CONFIG_IA64 | 543 | #ifdef CONFIG_IA64 |
538 | if(adapter->portnum == 0) { | 544 | if(adapter->portnum == 0) { |