aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_ip6.c
diff options
context:
space:
mode:
authorTom Parkin <tparkin@katalix.com>2020-07-24 16:31:49 +0100
committerDavid S. Miller <davem@davemloft.net>2020-07-24 17:19:14 -0700
commit95075150d0bdaa78cc350efc606e6ed02fa2a991 (patch)
tree9f2e7992808183dbaa988f039431355efb410a8b /net/l2tp/l2tp_ip6.c
parentMerge branch 'icmp6-support-rfc-4884' (diff)
downloadlinux-dev-95075150d0bdaa78cc350efc606e6ed02fa2a991.tar.xz
linux-dev-95075150d0bdaa78cc350efc606e6ed02fa2a991.zip
l2tp: avoid multiple assignments
checkpatch warns about multiple assignments. Update l2tp accordingly. Signed-off-by: Tom Parkin <tparkin@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/l2tp/l2tp_ip6.c6
1 files changed, 4 insertions, 2 deletions
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);