diff options
author | 2018-08-06 09:04:48 +0200 | |
---|---|---|
committer | 2018-08-06 09:04:48 +0200 | |
commit | a30461080366214b690a367225a48c95d7a6a189 (patch) | |
tree | 02cd7cfb8cea14cebe1ab2a1638edd8c9b9e0d3f /net/l2tp/l2tp_ip6.c | |
parent | ieee802154: add rx LQI from userspace (diff) | |
parent | tc-testing: remove duplicate spaces in skbedit match patterns (diff) | |
download | linux-dev-a30461080366214b690a367225a48c95d7a6a189.tar.xz linux-dev-a30461080366214b690a367225a48c95d7a6a189.zip |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/l2tp/l2tp_ip6.c')
-rw-r--r-- | net/l2tp/l2tp_ip6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 672e5b753738..42f828cf62fb 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -178,8 +178,7 @@ static int l2tp_ip6_recv(struct sk_buff *skb) print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length); } - l2tp_recv_common(session, skb, ptr, optr, 0, skb->len, - tunnel->recv_payload_hook); + l2tp_recv_common(session, skb, ptr, optr, 0, skb->len); l2tp_session_dec_refcount(session); return 0; |