diff options
| author | James Chapman <jchapman@katalix.com> | 2018-01-03 22:48:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-05 11:03:04 -0500 |
| commit | 863def15b9755d9016df4d93addf3127f1dc67f4 (patch) | |
| tree | c8e2a7578b6bef4f9b1d84c2bd3b1a70d59e84bb /net/l2tp/l2tp_core.c | |
| parent | 74bd5d56bfcb857abb5ae7d9f47933be9d288cbd (diff) | |
| download | linux-863def15b9755d9016df4d93addf3127f1dc67f4.tar.gz linux-863def15b9755d9016df4d93addf3127f1dc67f4.tar.bz2 linux-863def15b9755d9016df4d93addf3127f1dc67f4.zip | |
l2tp: revert "l2tp: add peer_offset parameter"
Revert commit f15bc54eeecd ("l2tp: add peer_offset parameter"). This
is removed because it is adding another configurable offset and
configurable offsets are being removed.
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_core.c')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 6ff64717da1e..115918ad8eca 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -792,7 +792,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, ptr += 2 + offset; } } else - ptr += session->peer_offset; + ptr += session->offset; offset = ptr - optr; if (!pskb_may_pull(skb, offset)) @@ -1785,7 +1785,6 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn session->lns_mode = cfg->lns_mode; session->reorder_timeout = cfg->reorder_timeout; session->offset = cfg->offset; - session->peer_offset = cfg->peer_offset; session->l2specific_type = cfg->l2specific_type; session->l2specific_len = cfg->l2specific_len; session->cookie_len = cfg->cookie_len; |