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>
This commit is contained in:

committed by
David S. Miller

parent
3454f83583
commit
8e95a2026f
@@ -238,8 +238,8 @@ static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
|
||||
struct skge_port *skge = netdev_priv(dev);
|
||||
struct skge_hw *hw = skge->hw;
|
||||
|
||||
if ((wol->wolopts & ~wol_supported(hw))
|
||||
|| !device_can_wakeup(&hw->pdev->dev))
|
||||
if ((wol->wolopts & ~wol_supported(hw)) ||
|
||||
!device_can_wakeup(&hw->pdev->dev))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
skge->wol = wol->wolopts;
|
||||
@@ -576,9 +576,10 @@ static void skge_get_pauseparam(struct net_device *dev,
|
||||
{
|
||||
struct skge_port *skge = netdev_priv(dev);
|
||||
|
||||
ecmd->rx_pause = (skge->flow_control == FLOW_MODE_SYMMETRIC)
|
||||
|| (skge->flow_control == FLOW_MODE_SYM_OR_REM);
|
||||
ecmd->tx_pause = ecmd->rx_pause || (skge->flow_control == FLOW_MODE_LOC_SEND);
|
||||
ecmd->rx_pause = ((skge->flow_control == FLOW_MODE_SYMMETRIC) ||
|
||||
(skge->flow_control == FLOW_MODE_SYM_OR_REM));
|
||||
ecmd->tx_pause = (ecmd->rx_pause ||
|
||||
(skge->flow_control == FLOW_MODE_LOC_SEND));
|
||||
|
||||
ecmd->autoneg = ecmd->rx_pause || ecmd->tx_pause;
|
||||
}
|
||||
@@ -2779,8 +2780,8 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
|
||||
/* This seems backwards, but it is what the sk98lin
|
||||
* does. Looks like hardware is wrong?
|
||||
*/
|
||||
if (ipip_hdr(skb)->protocol == IPPROTO_UDP
|
||||
&& hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
|
||||
if (ipip_hdr(skb)->protocol == IPPROTO_UDP &&
|
||||
hw->chip_rev == 0 && hw->chip_id == CHIP_ID_YUKON)
|
||||
control = BMU_TCP_CHECK;
|
||||
else
|
||||
control = BMU_UDP_CHECK;
|
||||
@@ -2948,8 +2949,8 @@ static void genesis_set_multicast(struct net_device *dev)
|
||||
else {
|
||||
memset(filter, 0, sizeof(filter));
|
||||
|
||||
if (skge->flow_status == FLOW_STAT_REM_SEND
|
||||
|| skge->flow_status == FLOW_STAT_SYMMETRIC)
|
||||
if (skge->flow_status == FLOW_STAT_REM_SEND ||
|
||||
skge->flow_status == FLOW_STAT_SYMMETRIC)
|
||||
genesis_add_filter(filter, pause_mc_addr);
|
||||
|
||||
for (i = 0; list && i < count; i++, list = list->next)
|
||||
@@ -2972,8 +2973,8 @@ static void yukon_set_multicast(struct net_device *dev)
|
||||
struct skge_hw *hw = skge->hw;
|
||||
int port = skge->port;
|
||||
struct dev_mc_list *list = dev->mc_list;
|
||||
int rx_pause = (skge->flow_status == FLOW_STAT_REM_SEND
|
||||
|| skge->flow_status == FLOW_STAT_SYMMETRIC);
|
||||
int rx_pause = (skge->flow_status == FLOW_STAT_REM_SEND ||
|
||||
skge->flow_status == FLOW_STAT_SYMMETRIC);
|
||||
u16 reg;
|
||||
u8 filter[8];
|
||||
|
||||
|
Reference in New Issue
Block a user