Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327845
b: refs/heads/master
c: 34dab17
h: refs/heads/master
i:
  327843: f15968d
v: v3
  • Loading branch information
Yuval Mintz authored and David S. Miller committed Sep 10, 2012
1 parent aec0dce commit 3d2b74f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 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: 08e9acc25a60e845101840ce6db368dc6d77c3c1
refs/heads/master: 34dab172f08e0456f3f8a8f6497567cf6744535e
2 changes: 0 additions & 2 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -6540,7 +6540,6 @@ static int bnx2x_update_link_down(struct link_params *params,
/* Prevent LPI Generation by chip */
REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2),
0);
REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);
REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 + (params->port << 2),
0);
vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK |
Expand Down Expand Up @@ -9932,7 +9931,6 @@ static int bnx2x_8483x_disable_eee(struct bnx2x_phy *phy,

/* Make Certain LPI is disabled */
REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), 0);
REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);

/* Prevent Phy from working in EEE and advertising it */
rc = bnx2x_84833_cmd_hdlr(phy, params,
Expand Down

0 comments on commit 3d2b74f

Please sign in to comment.