projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 9880552d GKH |
1 | From 9441cad99b4b09d6b627351c2d282833868c116c Mon Sep 17 00:00:00 2001 |
| 2 | From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | |
| 3 | Date: Mon, 19 Apr 2010 15:32:20 +0000 | |
| 4 | Subject: cxgb3: fix linkup issue | |
| 5 | ||
| 6 | From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | |
| 7 | ||
| 8 | commit 9441cad99b4b09d6b627351c2d282833868c116c upstream. | |
| 9 | ||
| 10 | I encountered an issue that not to link up on cxgb3 fabric. | |
| 11 | I bisected and found that this regression was introduced by | |
| 12 | 0f07c4ee8c800923ae7918c231532a9256233eed. | |
| 13 | ||
| 14 | Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep(). | |
| 15 | ||
| 16 | Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | |
| 17 | Acked-by: Divy Le Ray <divy@chelsio.com> | |
| 18 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 20 | ||
| 21 | --- | |
| 22 | drivers/net/cxgb3/ael1002.c | 2 +- | |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 24 | ||
| 25 | --- a/drivers/net/cxgb3/ael1002.c | |
| 26 | +++ b/drivers/net/cxgb3/ael1002.c | |
| 27 | @@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = | |
| 28 | int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter, | |
| 29 | int phy_addr, const struct mdio_ops *mdio_ops) | |
| 30 | { | |
| 31 | - cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops, | |
| 32 | + cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops, | |
| 33 | SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP, | |
| 34 | "10GBASE-CX4"); | |
| 35 | return 0; |