summaryrefslogtreecommitdiff
path: root/net/l2tp/l2tp_core.h
diff options
context:
space:
mode:
authorJames Chapman <jchapman@katalix.com>2018-01-03 22:48:04 +0000
committerDavid S. Miller <davem@davemloft.net>2018-01-05 11:03:04 -0500
commit863def15b9755d9016df4d93addf3127f1dc67f4 (patch)
treec8e2a7578b6bef4f9b1d84c2bd3b1a70d59e84bb /net/l2tp/l2tp_core.h
parent74bd5d56bfcb857abb5ae7d9f47933be9d288cbd (diff)
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.h')
-rw-r--r--net/l2tp/l2tp_core.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index c6fe7cc42a05..9534e16965cc 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -59,8 +59,7 @@ struct l2tp_session_cfg {
int debug; /* bitmask of debug message
* categories */
u16 vlan_id; /* VLAN pseudowire only */
- u16 offset; /* offset to tx payload */
- u16 peer_offset; /* offset to rx payload */
+ u16 offset; /* offset to payload */
u16 l2specific_len; /* Layer 2 specific length */
u16 l2specific_type; /* Layer 2 specific type */
u8 cookie[8]; /* optional cookie */
@@ -87,14 +86,8 @@ struct l2tp_session {
int cookie_len;
u8 peer_cookie[8];
int peer_cookie_len;
- u16 offset; /* offset from end of L2TP
- * header to beginning of
- * tx data
- */
- u16 peer_offset; /* offset from end of L2TP
- * header to beginning of
- * rx data
- */
+ u16 offset; /* offset from end of L2TP header
+ to beginning of data */
u16 l2specific_len;
u16 l2specific_type;
u16 hdr_len;