Skip to content

Commit 23fe846

Browse files
Guillaume Naultdavem330
authored andcommitted
l2tp: adjust comments about L2TPv3 offsets
The "offset" option has been removed by commit 900631e ("l2tp: remove configurable payload offset"). Signed-off-by: Guillaume Nault <[email protected]> Acked-by: James Chapman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f102852 commit 23fe846

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

include/uapi/linux/l2tp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct sockaddr_l2tpip6 {
6565
* TUNNEL_MODIFY - CONN_ID, udpcsum
6666
* TUNNEL_GETSTATS - CONN_ID, (stats)
6767
* TUNNEL_GET - CONN_ID, (...)
68-
* SESSION_CREATE - SESSION_ID, PW_TYPE, offset, data_seq, cookie, peer_cookie, offset, l2spec
68+
* SESSION_CREATE - SESSION_ID, PW_TYPE, data_seq, cookie, peer_cookie, l2spec
6969
* SESSION_DELETE - SESSION_ID
7070
* SESSION_MODIFY - SESSION_ID, data_seq
7171
* SESSION_GET - SESSION_ID, (...)

net/l2tp/l2tp_core.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,9 @@ static int l2tp_recv_data_seq(struct l2tp_session *session, struct sk_buff *skb)
662662
* |x|S|x|x|x|x|x|x| Sequence Number |
663663
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
664664
*
665-
* Cookie value, sublayer format and offset (pad) are negotiated with
666-
* the peer when the session is set up. Unlike L2TPv2, we do not need
667-
* to parse the packet header to determine if optional fields are
668-
* present.
665+
* Cookie value and sublayer format are negotiated with the peer when
666+
* the session is set up. Unlike L2TPv2, we do not need to parse the
667+
* packet header to determine if optional fields are present.
669668
*
670669
* Caller must already have parsed the frame and determined that it is
671670
* a data (not control) frame before coming here. Fields up to the

0 commit comments

Comments
 (0)