diff options
| author | Yuval Mintz | 2012-12-02 05:05:56 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-12-03 02:23:00 +0100 |
| commit | cd1dfce2ed571bc3d1962987b5c7d2d6e936bb27 (patch) | |
| tree | 6cd9adf4bb0a7035652f9dc360da95c27f84afe2 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |
| parent | bnx2x: prevent DCB if disabled in nvram (diff) | |
| download | kernel-qcow2-linux-cd1dfce2ed571bc3d1962987b5c7d2d6e936bb27.tar.gz kernel-qcow2-linux-cd1dfce2ed571bc3d1962987b5c7d2d6e936bb27.tar.xz kernel-qcow2-linux-cd1dfce2ed571bc3d1962987b5c7d2d6e936bb27.zip | |
bnx2x: fix 'Ethtool -A' when autoneg
When configuring pauses using 'ethtool -A', the requested values have
effect when used together with autoneg (up to this point, when configured
for autoneg, driver ignored requested pause configuration)
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index ad280740b134..32c3ab72718c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -144,7 +144,7 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param); * @bp: driver handle * @load_mode: current mode */ -u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode); +int bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode); /** * bnx2x_link_set - configure hw according to link parameters structure. |