diff options
| author | Joe Perches <joe@perches.com> | 2009-12-03 07:58:21 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:18:01 -0800 | 
| commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
| tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/ibm_newemac/core.c | |
| parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) | |
| download | olio-linux-3.10-8e95a2026f3b43f7c3d676adaccd2de9532e8dcc.tar.xz olio-linux-3.10-8e95a2026f3b43f7c3d676adaccd2de9532e8dcc.zip  | |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
| -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 af117c626e7..fb5e019169e 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,  	if (cmd->autoneg == AUTONEG_DISABLE) {  		switch (cmd->speed) {  		case SPEED_10: -			if (cmd->duplex == DUPLEX_HALF -			    && !(f & SUPPORTED_10baseT_Half)) +			if (cmd->duplex == DUPLEX_HALF && +			    !(f & SUPPORTED_10baseT_Half))  				return -EINVAL; -			if (cmd->duplex == DUPLEX_FULL -			    && !(f & SUPPORTED_10baseT_Full)) +			if (cmd->duplex == DUPLEX_FULL && +			    !(f & SUPPORTED_10baseT_Full))  				return -EINVAL;  			break;  		case SPEED_100: -			if (cmd->duplex == DUPLEX_HALF -			    && !(f & SUPPORTED_100baseT_Half)) +			if (cmd->duplex == DUPLEX_HALF && +			    !(f & SUPPORTED_100baseT_Half))  				return -EINVAL; -			if (cmd->duplex == DUPLEX_FULL -			    && !(f & SUPPORTED_100baseT_Full)) +			if (cmd->duplex == DUPLEX_FULL && +			    !(f & SUPPORTED_100baseT_Full))  				return -EINVAL;  			break;  		case SPEED_1000: -			if (cmd->duplex == DUPLEX_HALF -			    && !(f & SUPPORTED_1000baseT_Half)) +			if (cmd->duplex == DUPLEX_HALF && +			    !(f & SUPPORTED_1000baseT_Half))  				return -EINVAL; -			if (cmd->duplex == DUPLEX_FULL -			    && !(f & SUPPORTED_1000baseT_Full)) +			if (cmd->duplex == DUPLEX_FULL && +			    !(f & SUPPORTED_1000baseT_Full))  				return -EINVAL;  			break;  		default:  |