iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgb3: fix 2 ports 1G regression

Browse Source 
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>
This commit is contained in:
Divy Le Ray 2009-08-05 20:28:27 -07:00 committed by David S. Miller
parent cc104e52b4
commit 9073e3a32b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/cxgb3/t3_hw.c
View File

@ -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) void mac_prep(struct cmac *mac, struct adapter *adapter, int index)
{ {
u16 devid;
mac->adapter = adapter; 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; index = 0;
mac->offset = (XGMAC0_1_BASE_ADDR - XGMAC0_0_BASE_ADDR) * index; mac->offset = (XGMAC0_1_BASE_ADDR - XGMAC0_0_BASE_ADDR) * index;
mac->nucast = 1; mac->nucast = 1;