diff options
Diffstat (limited to 'drivers/net/ibm_newemac')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index af117c626e73..fb5e019169ee 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
| @@ -1976,27 +1976,27 @@ static int emac_ethtool_set_settings(struct net_device *ndev, | |||
| 1976 | if (cmd->autoneg == AUTONEG_DISABLE) { | 1976 | if (cmd->autoneg == AUTONEG_DISABLE) { |
| 1977 | switch (cmd->speed) { | 1977 | switch (cmd->speed) { |
| 1978 | case SPEED_10: | 1978 | case SPEED_10: |
| 1979 | if (cmd->duplex == DUPLEX_HALF | 1979 | if (cmd->duplex == DUPLEX_HALF && |
| 1980 | && !(f & SUPPORTED_10baseT_Half)) | 1980 | !(f & SUPPORTED_10baseT_Half)) |
| 1981 | return -EINVAL; | 1981 | return -EINVAL; |
| 1982 | if (cmd->duplex == DUPLEX_FULL | 1982 | if (cmd->duplex == DUPLEX_FULL && |
| 1983 | && !(f & SUPPORTED_10baseT_Full)) | 1983 | !(f & SUPPORTED_10baseT_Full)) |
| 1984 | return -EINVAL; | 1984 | return -EINVAL; |
| 1985 | break; | 1985 | break; |
| 1986 | case SPEED_100: | 1986 | case SPEED_100: |
| 1987 | if (cmd->duplex == DUPLEX_HALF | 1987 | if (cmd->duplex == DUPLEX_HALF && |
| 1988 | && !(f & SUPPORTED_100baseT_Half)) | 1988 | !(f & SUPPORTED_100baseT_Half)) |
| 1989 | return -EINVAL; | 1989 | return -EINVAL; |
| 1990 | if (cmd->duplex == DUPLEX_FULL | 1990 | if (cmd->duplex == DUPLEX_FULL && |
| 1991 | && !(f & SUPPORTED_100baseT_Full)) | 1991 | !(f & SUPPORTED_100baseT_Full)) |
| 1992 | return -EINVAL; | 1992 | return -EINVAL; |
| 1993 | break; | 1993 | break; |
| 1994 | case SPEED_1000: | 1994 | case SPEED_1000: |
| 1995 | if (cmd->duplex == DUPLEX_HALF | 1995 | if (cmd->duplex == DUPLEX_HALF && |
| 1996 | && !(f & SUPPORTED_1000baseT_Half)) | 1996 | !(f & SUPPORTED_1000baseT_Half)) |
| 1997 | return -EINVAL; | 1997 | return -EINVAL; |
| 1998 | if (cmd->duplex == DUPLEX_FULL | 1998 | if (cmd->duplex == DUPLEX_FULL && |
| 1999 | && !(f & SUPPORTED_1000baseT_Full)) | 1999 | !(f & SUPPORTED_1000baseT_Full)) |
| 2000 | return -EINVAL; | 2000 | return -EINVAL; |
| 2001 | break; | 2001 | break; |
| 2002 | default: | 2002 | default: |