Merge tag 'tag-chrome-platform-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / l2tp / l2tp_ip6.c

diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index ca76961..bc757bc 100644 (file)
--- 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);
@@ -486,7 +488,7 @@ static int l2tp_ip6_push_pending_frames(struct sock *sk)
        int err = 0;
 
        skb = skb_peek(&sk->sk_write_queue);
-       if (skb == NULL)
+       if (!skb)
                goto out;
 
        transhdr = (__be32 *)skb_transport_header(skb);