diff --git a/[refs] b/[refs] index 4aa167e7113f..d71b11dd38f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed9f524ac79457f0c547c85746b19b92526be612 +refs/heads/master: 45798c28b43d06d371df2e26e4a143c6f1428c6d diff --git a/trunk/drivers/net/bnx2x/bnx2x_link.c b/trunk/drivers/net/bnx2x/bnx2x_link.c index c2146e78d6b1..0383e3066313 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_link.c +++ b/trunk/drivers/net/bnx2x/bnx2x_link.c @@ -3735,7 +3735,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) /* Clear first 3 bits of the control */ val &= ~0x7; /* Set control bits according to - configuration */ + configuation */ val |= (params->xgxs_config_rx[i] & 0x7); DP(NETIF_MSG_LINK, "Setting RX"