summaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_ip.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-04 08:48:26 +0200
committerIngo Molnar <mingo@kernel.org>2016-05-04 08:48:26 +0200
commitd63c214b0a39e7e92fbae2a47b66e8145c3c9c81 (patch)
treeca797379eeb01c96308c8e2abdcea3b55040d489 /net/l2tp/l2tp_ip.c
parentx86/platform: Remove unused get_bios_ebda_length() function (diff)
parentLinux 4.6-rc6 (diff)
downloadlinux-d63c214b0a39e7e92fbae2a47b66e8145c3c9c81.tar.xz
linux-d63c214b0a39e7e92fbae2a47b66e8145c3c9c81.zip
Merge tag 'v4.6-rc6' into x86/platform, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/l2tp/l2tp_ip.c')
-rw-r--r--net/l2tp/l2tp_ip.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index ec22078b0914..42de4ccd159f 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -123,12 +123,11 @@ static int l2tp_ip_recv(struct sk_buff *skb)
struct l2tp_tunnel *tunnel = NULL;
int length;
- /* Point to L2TP header */
- optr = ptr = skb->data;
-
if (!pskb_may_pull(skb, 4))
goto discard;
+ /* Point to L2TP header */
+ optr = ptr = skb->data;
session_id = ntohl(*((__be32 *) ptr));
ptr += 4;
@@ -156,6 +155,9 @@ static int l2tp_ip_recv(struct sk_buff *skb)
if (!pskb_may_pull(skb, length))
goto discard;
+ /* Point to L2TP header */
+ optr = ptr = skb->data;
+ ptr += 4;
pr_debug("%s: ip recv\n", tunnel->name);
print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
}