aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c507.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/3c507.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
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/3c507.c')
-rw-r--r--drivers/net/3c507.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 605f1d17a8f3..fbc231153e55 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -836,8 +836,8 @@ static void el16_rx(struct net_device *dev)
836 void __iomem *data_frame = lp->base + data_buffer_addr; 836 void __iomem *data_frame = lp->base + data_buffer_addr;
837 ushort pkt_len = readw(data_frame); 837 ushort pkt_len = readw(data_frame);
838 838
839 if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 839 if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22 ||
840 || (pkt_len & 0xC000) != 0xC000) { 840 (pkt_len & 0xC000) != 0xC000) {
841 pr_err("%s: Rx frame at %#x corrupted, " 841 pr_err("%s: Rx frame at %#x corrupted, "
842 "status %04x cmd %04x next %04x " 842 "status %04x cmd %04x next %04x "
843 "data-buf @%04x %04x.\n", 843 "data-buf @%04x %04x.\n",