diff options
| author | Divy Le Ray <divy@chelsio.com> | 2009-08-05 20:28:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-05 20:28:27 -0700 |
| commit | 9073e3a32bb249293edc01ecff575bb87380c068 (patch) | |
| tree | 56ccb72087bcec9190e3eff39ac56d9de7106022 | |
| parent | cc104e52b4f61dbfe1a815f775ffb2fbbb4b785d (diff) | |
| download | kernel_samsung_smdk4412-9073e3a32bb249293edc01ecff575bb87380c068.zip kernel_samsung_smdk4412-9073e3a32bb249293edc01ecff575bb87380c068.tar.gz kernel_samsung_smdk4412-9073e3a32bb249293edc01ecff575bb87380c068.tar.bz2 | |
cxgb3: fix 2 ports 1G regression
commit 88045b3cf0f8981129cb489c7b6bc36c21dd33a7
cxgb3: fix mac index mapping
Override the mac index computation for the gen2 adapter,
as each port is expected to use index 0.
introduces a regression on 2 port 1G adapter
as its xauicfg vpd value is null.
Add a check on the device id.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 526e144..032cfe0 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c @@ -3692,8 +3692,12 @@ static void mc7_prep(struct adapter *adapter, struct mc7 *mc7, void mac_prep(struct cmac *mac, struct adapter *adapter, int index) { + u16 devid; + mac->adapter = adapter; - if (!adapter->params.vpd.xauicfg[1]) + pci_read_config_word(adapter->pdev, 0x2, &devid); + + if (devid == 0x37 && !adapter->params.vpd.xauicfg[1]) index = 0; mac->offset = (XGMAC0_1_BASE_ADDR - XGMAC0_0_BASE_ADDR) * index; mac->nucast = 1; |