summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2018-12-20 21:29:20 +0300
committerDavid S. Miller <davem@davemloft.net>2018-12-21 03:49:30 +0300
commit7fb1b8ca8fa1ee34ffc328f17f78da68c7cc04e6 (patch)
tree0bfd98344d7e7880084591acdbc2e6ec0e7ba8f9 /net
parente69fbf31ca2cf6d6a2afedd0f8b30dcd10e76049 (diff)
downloadlinux-7fb1b8ca8fa1ee34ffc328f17f78da68c7cc04e6.tar.xz
ppp: Move PFC decompression to PPP generic layer
Extract "Protocol" field decompression code from transport protocols to PPP generic layer, where it actually belongs. As a consequence, this patch fixes incorrect place of PFC decompression in L2TP driver (when it's not PPPOX_BOUND) and also enables this decompression for other protocols, like PPPoE. Protocol field decompression also happens in PPP Multilink Protocol code and in PPP compression protocols implementations (bsd, deflate, mppe). It looks like there is no easy way to get rid of that, so it was decided to leave it as is, but provide those cases with appropriate comments instead. Changes in v2: - Fix the order of checking skb data room and proto decompression - Remove "inline" keyword from ppp_decompress_proto() - Don't split line before function name - Prefix ppp_decompress_proto() function with "__" - Add ppp_decompress_proto() function with skb data room checks - Add description for introduced functions - Fix comments (as per review on mailing list) Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/l2tp/l2tp_ppp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index c03c6461f236..04d9946dcdba 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -236,10 +236,6 @@ static void pppol2tp_recv(struct l2tp_session *session, struct sk_buff *skb, int
skb->data[1] == PPP_UI)
skb_pull(skb, 2);
- /* Decompress protocol field if PFC is enabled */
- if ((*skb->data) & 0x1)
- *(u8 *)skb_push(skb, 1) = 0;
-
if (sk->sk_state & PPPOX_BOUND) {
struct pppox_sock *po;