diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 12:49:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 12:49:13 -0700 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /drivers/net/cxgb3 | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/ael1002.c | 2 | ||||
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c index 5248f9e0b2f..35cd3672915 100644 --- a/drivers/net/cxgb3/ael1002.c +++ b/drivers/net/cxgb3/ael1002.c @@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = { int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr, const struct mdio_ops *mdio_ops) { - cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops, + cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops, SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP, "10GBASE-CX4"); return 0; diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index aced6c5e635..e3f1b856649 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -439,7 +439,7 @@ static void free_irq_resources(struct adapter *adapter) static int await_mgmt_replies(struct adapter *adap, unsigned long init_cnt, unsigned long n) { - int attempts = 5; + int attempts = 10; while (adap->sge.qs[0].rspq.offload_pkts < init_cnt + n) { if (!--attempts) |