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
@@ -1566,8 +1566,8 @@ static int hamachi_rx(struct net_device *dev)
|
||||
#endif
|
||||
/* Check if the packet is long enough to accept without copying
|
||||
to a minimally-sized skbuff. */
|
||||
if (pkt_len < rx_copybreak
|
||||
&& (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
|
||||
if (pkt_len < rx_copybreak &&
|
||||
(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
|
||||
#ifdef RX_CHECKSUM
|
||||
printk(KERN_ERR "%s: rx_copybreak non-zero "
|
||||
"not good with RX_CHECKSUM\n", dev->name);
|
||||
@@ -1722,10 +1722,10 @@ static void hamachi_error(struct net_device *dev, int intr_status)
|
||||
readl(ioaddr + 0x370);
|
||||
readl(ioaddr + 0x3F0);
|
||||
}
|
||||
if ((intr_status & ~(LinkChange|StatsMax|NegotiationChange|IntrRxDone|IntrTxDone))
|
||||
&& hamachi_debug)
|
||||
if ((intr_status & ~(LinkChange|StatsMax|NegotiationChange|IntrRxDone|IntrTxDone)) &&
|
||||
hamachi_debug)
|
||||
printk(KERN_ERR "%s: Something Wicked happened! %4.4x.\n",
|
||||
dev->name, intr_status);
|
||||
dev->name, intr_status);
|
||||
/* Hmmmmm, it's not clear how to recover from PCI faults. */
|
||||
if (intr_status & (IntrTxPCIErr | IntrTxPCIFault))
|
||||
hmp->stats.tx_fifo_errors++;
|
||||
|
Reference in New Issue
Block a user