net: Move && and || to end of previous line

Not including net/atm/

Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 21 insertions, 21 deletions

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 7ed5fe664732..614c65d62ae4 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -211,9 +211,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
          * check if configuration can support the BA policy
          * and if buffer size does not exceeds max value */
         /* XXX: check own ht delayed BA capability?? */
-        if (((ba_policy != 1)
-                && (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_DELAY_BA)))
-                || (buf_size > IEEE80211_MAX_AMPDU_BUF)) {
+        if (((ba_policy != 1) &&
+             (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_DELAY_BA))) ||
+            (buf_size > IEEE80211_MAX_AMPDU_BUF)) {
                 status = WLAN_STATUS_INVALID_QOS_PARAM;
 #ifdef CONFIG_MAC80211_HT_DEBUG
                 if (net_ratelimit())
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index dd8ec8d5e8b2..8116d1a96a4a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -631,8 +631,8 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
         sta_info_stop(local);
         rate_control_deinitialize(local);
 
-        if (skb_queue_len(&local->skb_queue)
-                        || skb_queue_len(&local->skb_queue_unreliable))
+        if (skb_queue_len(&local->skb_queue) ||
+            skb_queue_len(&local->skb_queue_unreliable))
                 printk(KERN_WARNING "%s: skb_queue not empty\n",
                        wiphy_name(local->hw.wiphy));
         skb_queue_purge(&local->skb_queue);
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 51adb1115215..c0fe46493f71 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -195,8 +195,8 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
                         list_del(&p->list);
                         kmem_cache_free(rm_cache, p);
                         --entries;
-                } else if ((seqnum == p->seqnum)
-                                && (memcmp(sa, p->sa, ETH_ALEN) == 0))
+                } else if ((seqnum == p->seqnum) &&
+                           (memcmp(sa, p->sa, ETH_ALEN) == 0))
                         return -1;
         }
 
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 9aecf0207afc..833b2f3670c5 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -936,17 +936,16 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
         }
 
         if (mpath->flags & MESH_PATH_ACTIVE) {
-                if (time_after(jiffies, mpath->exp_time +
-                        msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time))
-                                && !memcmp(sdata->dev->dev_addr, hdr->addr4,
-                                           ETH_ALEN)
-                                && !(mpath->flags & MESH_PATH_RESOLVING)
-                                && !(mpath->flags & MESH_PATH_FIXED)) {
+                if (time_after(jiffies,
+                               mpath->exp_time +
+                               msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
+                    !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
+                    !(mpath->flags & MESH_PATH_RESOLVING) &&
+                    !(mpath->flags & MESH_PATH_FIXED)) {
                         mesh_queue_preq(mpath,
                                         PREQ_Q_F_START | PREQ_Q_F_REFRESH);
                 }
-                memcpy(hdr->addr1, mpath->next_hop->sta.addr,
-                                ETH_ALEN);
+                memcpy(hdr->addr1, mpath->next_hop->sta.addr, ETH_ALEN);
         } else {
                 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
                 if (!(mpath->flags & MESH_PATH_RESOLVING)) {
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 96f13ad05d3c..beecf50fbd10 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1168,8 +1168,8 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)
                              rx->key))
                         return -EACCES;
                 /* BIP does not use Protected field, so need to check MMIE */
-                if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb)
-                             && ieee80211_get_mmie_keyidx(rx->skb) < 0 &&
+                if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) &&
+                             ieee80211_get_mmie_keyidx(rx->skb) < 0 &&
                              rx->key))
                         return -EACCES;
                 /*
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 943def2b07df..8834cc93c716 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -366,10 +366,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
         u32 staflags;
 
-        if (unlikely(!sta || ieee80211_is_probe_resp(hdr->frame_control)
-                        || ieee80211_is_auth(hdr->frame_control)
-                        || ieee80211_is_assoc_resp(hdr->frame_control)
-                        || ieee80211_is_reassoc_resp(hdr->frame_control)))
+        if (unlikely(!sta ||
+                     ieee80211_is_probe_resp(hdr->frame_control) ||
+                     ieee80211_is_auth(hdr->frame_control) ||
+                     ieee80211_is_assoc_resp(hdr->frame_control) ||
+                     ieee80211_is_reassoc_resp(hdr->frame_control)))
                 return TX_CONTINUE;
 
         staflags = get_sta_flags(sta);