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, 2 insertions, 3 deletions

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