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>

2 files changed, 6 insertions, 6 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 7775e8b48deb..5d131c2f84cc 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2677,9 +2677,10 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
                 return GRO_NORMAL;
 
         for (p = napi->gro_list; p; p = p->next) {
-                NAPI_GRO_CB(p)->same_flow = (p->dev == skb->dev)
-                        && !compare_ether_header(skb_mac_header(p),
-                                                 skb_gro_mac_header(skb));
+                NAPI_GRO_CB(p)->same_flow =
+                        (p->dev == skb->dev) &&
+                        !compare_ether_header(skb_mac_header(p),
+                                              skb_gro_mac_header(skb));
                 NAPI_GRO_CB(p)->flush = 0;
         }
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 19ee493ec178..a23b45f08ec9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2052,9 +2052,8 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                                 read_lock_bh(&idev->lock);
                                 for (ifp = idev->addr_list; ifp;
                                      ifp = ifp->if_next) {
-                                        if (ifp->scope == IFA_LINK
-                                            && !(ifp->
-                                                 flags & IFA_F_TENTATIVE)) {
+                                        if (ifp->scope == IFA_LINK &&
+                                            !(ifp->flags & IFA_F_TENTATIVE)) {
                                                 ipv6_addr_copy(&pkt_dev->
                                                                cur_in6_saddr,
                                                                &ifp->addr);