diff options
| author | Madalin Bucur <madalin.bucur@nxp.com> | 2016-07-07 08:25:24 -0400 |
|---|---|---|
| committer | Madalin Bucur <madalin.bucur@nxp.com> | 2016-10-04 02:26:10 -0400 |
| commit | 73912d51d6c80096e95d29118b48c53393890bf2 (patch) | |
| tree | 1a1d270d584b0bd5701dfdb2c0fb47c1470e2cca /drivers/net | |
| parent | 604104fc549a32ae928435a48de6761af13836ea (diff) | |
fsl/fman: simplify redundant condition
Change suggested by David Binderman, thanks.
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/fman.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index 2278bbd6bdfe..1fc10493a6b1 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c | |||
| @@ -2331,8 +2331,7 @@ int fman_set_mac_max_frame(struct fman *fman, u8 mac_id, u16 mfl) | |||
| 2331 | * or equal to the port's max | 2331 | * or equal to the port's max |
| 2332 | */ | 2332 | */ |
| 2333 | if ((!fman->state->port_mfl[mac_id]) || | 2333 | if ((!fman->state->port_mfl[mac_id]) || |
| 2334 | (fman->state->port_mfl[mac_id] && | 2334 | (mfl <= fman->state->port_mfl[mac_id])) { |
| 2335 | (mfl <= fman->state->port_mfl[mac_id]))) { | ||
| 2336 | fman->state->mac_mfl[mac_id] = mfl; | 2335 | fman->state->mac_mfl[mac_id] = mfl; |
| 2337 | } else { | 2336 | } else { |
| 2338 | dev_warn(fman->dev, "%s: MAC max_frame_length is larger than Port max_frame_length\n", | 2337 | dev_warn(fman->dev, "%s: MAC max_frame_length is larger than Port max_frame_length\n", |