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
@@ -114,8 +114,8 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
|
||||
*/
|
||||
|
||||
/* Issue the request; xid is unique, don't bother byteswapping it */
|
||||
if (likely(buf->msg_type != RNDIS_MSG_HALT
|
||||
&& buf->msg_type != RNDIS_MSG_RESET)) {
|
||||
if (likely(buf->msg_type != RNDIS_MSG_HALT &&
|
||||
buf->msg_type != RNDIS_MSG_RESET)) {
|
||||
xid = dev->xid++;
|
||||
if (!xid)
|
||||
xid = dev->xid++;
|
||||
@@ -493,9 +493,9 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
||||
data_len = le32_to_cpu(hdr->data_len);
|
||||
|
||||
/* don't choke if we see oob, per-packet data, etc */
|
||||
if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET
|
||||
|| skb->len < msg_len
|
||||
|| (data_offset + data_len + 8) > msg_len)) {
|
||||
if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET ||
|
||||
skb->len < msg_len ||
|
||||
(data_offset + data_len + 8) > msg_len)) {
|
||||
dev->net->stats.rx_frame_errors++;
|
||||
devdbg(dev, "bad rndis message %d/%d/%d/%d, len %d",
|
||||
le32_to_cpu(hdr->msg_type),
|
||||
|
Reference in New Issue
Block a user