Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262463
b: refs/heads/master
c: afad009
h: refs/heads/master
i:
  262461: 6fade96
  262459: 0495b92
  262455: 0f40a86
  262447: 162ad03
  262431: bb23857
  262399: 96fae13
v: v3
  • Loading branch information
Yaniv Rosner authored and David S. Miller committed Aug 3, 2011
1 parent dc46b32 commit f56bdbc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2059a061164120a1e44a0ca46fe08044d6d7c2d
refs/heads/master: afad009ad76ece72a3c9629bbc08f14459b9bba7
9 changes: 4 additions & 5 deletions trunk/drivers/net/bnx2x/bnx2x_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -11541,13 +11541,12 @@ void bnx2x_init_xmac_loopback(struct link_params *params,
* Set WC to loopback mode since link is required to provide clock
* to the XMAC in 20G mode
*/
if (vars->line_speed == SPEED_20000) {
bnx2x_set_aer_mmd(params, &params->phy[0]);
bnx2x_warpcore_reset_lane(bp, &params->phy[0], 0);
params->phy[INT_PHY].config_loopback(
bnx2x_set_aer_mmd(params, &params->phy[0]);
bnx2x_warpcore_reset_lane(bp, &params->phy[0], 0);
params->phy[INT_PHY].config_loopback(
&params->phy[INT_PHY],
params);
}

bnx2x_xmac_enable(params, vars, 1);
REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
}
Expand Down

0 comments on commit f56bdbc

Please sign in to comment.