diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2008-06-15 22:59:43 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-17 23:06:58 -0400 |
| commit | dc515f2e0b356981ea0c4581ff0e587aea8b624a (patch) | |
| tree | fa24f2d27a4234fea678dcc9fae530f090ecd905 | |
| parent | 8b8091fbf4d8791ad70b146ba2c892c62c2cdc6b (diff) | |
| download | kernel_samsung_smdk4412-dc515f2e0b356981ea0c4581ff0e587aea8b624a.zip kernel_samsung_smdk4412-dc515f2e0b356981ea0c4581ff0e587aea8b624a.tar.gz kernel_samsung_smdk4412-dc515f2e0b356981ea0c4581ff0e587aea8b624a.tar.bz2 | |
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>
| -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 7144c25..5a2fd21 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) netxen_initialize_adapter_sw(adapter); /* initialize the buffers in adapter */ /* Mezz cards have PCI function 0,2,3 enabled */ - if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) - && (pci_func_id >= 2)) + switch (adapter->ahw.boardcfg.board_type) { + case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ: + case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ: + if (pci_func_id >= 2) adapter->portnum = pci_func_id - 2; + break; + default: + break; + } #ifdef CONFIG_IA64 if(adapter->portnum == 0) { |