diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-27 12:11:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-27 12:11:52 -0500 |
| commit | 81487bf1f6a8a3e01eafb54937b1a646afe14ec5 (patch) | |
| tree | b0ce5e53ca229d324ba653f64b9cc4ac34dd8e4b /include/uapi | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (diff) | |
| parent | l2tp: add peer_offset parameter (diff) | |
Merge branch 'l2tp-next'
Lorenzo Bianconi says:
====================
l2tp: fix offset/peer_offset conf parameters
This patchset add peer_offset configuration parameter in order to
specify two different values for payload offset on tx/rx side.
Moreover fix missing print session offset info
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/l2tp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h index d84ce5c1c9aa..d6fee55dbded 100644 --- a/include/uapi/linux/l2tp.h +++ b/include/uapi/linux/l2tp.h @@ -127,6 +127,7 @@ enum { L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* flag */ L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* flag */ L2TP_ATTR_PAD, + L2TP_ATTR_PEER_OFFSET, /* u16 */ __L2TP_ATTR_MAX, }; |