Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit bf69c725 authored by Guillaume Nault's avatar Guillaume Nault Committed by Alistair Strachan
Browse files

BACKPORT: l2tp: remove ->recv_payload_hook



The tunnel reception hook is only used by l2tp_ppp for skipping PPP
framing bytes. This is a session specific operation, but once a PPP
session sets ->recv_payload_hook on its tunnel, all frames received by
the tunnel will enter pppol2tp_recv_payload_hook(), including those
targeted at Ethernet sessions (an L2TPv3 tunnel can multiplex PPP and
Ethernet sessions).

So this mechanism is wrong, and uselessly complex. Let's just move this
functionality to the pppol2tp rx handler and drop ->recv_payload_hook.

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

(cherry picked from commit 2b139e6b1ec86e1d3646039965dd79ad05d8dca4)
Bug: 116424816
Change-Id: I5ef813b680c7d1e60b675961a80bc7e1d8610586
Signed-off-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
parent 87a15f6d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment