[PATCH 1/9] l2tp: avoid multiple assignments

[Tom Parkin]

checkpatch warns about multiple assignments.

Update l2tp accordingly.

Signed-off-by: Tom Parkin <tpar...@katalix.com>
---
 net/l2tp/l2tp_core.c |  6 +++---
 net/l2tp/l2tp_ip.c   | 12 ++++++++----
 net/l2tp/l2tp_ip6.c  |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 7e3523015d6f..b871cceeff7c 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -621,8 +621,8 @@ void l2tp_recv_common(struct l2tp_session *session, struct 
sk_buff *skb,
                      int length)
 {
        struct l2tp_tunnel *tunnel = session->tunnel;
+       u32 ns = 0, nr = 0;
        int offset;
-       u32 ns, nr;
 
        /* Parse and check optional cookie */
        if (session->peer_cookie_len > 0) {
@@ -644,7 +644,6 @@ void l2tp_recv_common(struct l2tp_session *session, struct 
sk_buff *skb,
         * the control of the LNS.  If no sequence numbers present but
         * we were expecting them, discard frame.
         */
-       ns = nr = 0;
        L2TP_SKB_CB(skb)->has_seq = 0;
        if (tunnel->version == L2TP_HDR_VER_2) {
                if (hdrflags & L2TP_HDRFLAG_S) {
@@ -826,7 +825,8 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, 
struct sk_buff *skb)
        }
 
        /* Point to L2TP header */
-       optr = ptr = skb->data;
+       optr = skb->data;
+       ptr = skb->data;
 
        /* Get L2TP header flags */
        hdrflags = ntohs(*(__be16 *)ptr);
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index d81564cf1e7f..a159cb2bf0f4 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -124,7 +124,8 @@ static int l2tp_ip_recv(struct sk_buff *skb)
                goto discard;
 
        /* Point to L2TP header */
-       optr = ptr = skb->data;
+       optr = skb->data;
+       ptr = skb->data;
        session_id = ntohl(*((__be32 *)ptr));
        ptr += 4;
 
@@ -153,7 +154,8 @@ static int l2tp_ip_recv(struct sk_buff *skb)
                        goto discard_sess;
 
                /* Point to L2TP header */
-               optr = ptr = skb->data;
+               optr = skb->data;
+               ptr = skb->data;
                ptr += 4;
                pr_debug("%s: ip recv\n", tunnel->name);
                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
@@ -284,8 +286,10 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr 
*uaddr, int addr_len)
            chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
                goto out;
 
-       if (addr->l2tp_addr.s_addr)
-               inet->inet_rcv_saddr = inet->inet_saddr = 
addr->l2tp_addr.s_addr;
+       if (addr->l2tp_addr.s_addr) {
+               inet->inet_rcv_saddr = addr->l2tp_addr.s_addr;
+               inet->inet_saddr = addr->l2tp_addr.s_addr;
+       }
        if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
                inet->inet_saddr = 0;  /* Use device */
 
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 614febf8dd0d..bc757bc7e264 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -137,7 +137,8 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
                goto discard;
 
        /* Point to L2TP header */
-       optr = ptr = skb->data;
+       optr = skb->data;
+       ptr = skb->data;
        session_id = ntohl(*((__be32 *)ptr));
        ptr += 4;
 
@@ -166,7 +167,8 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
                        goto discard_sess;
 
                /* Point to L2TP header */
-               optr = ptr = skb->data;
+               optr = skb->data;
+               ptr = skb->data;
                ptr += 4;
                pr_debug("%s: ip recv\n", tunnel->name);
                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
-- 
2.17.1