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>

1 files changed, 7 insertions, 8 deletions

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)) {