diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-04 05:36:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-04 05:36:55 +0300 |
| commit | 2bdea157b99903c8d344dbae44fedf033db4e2c2 (patch) | |
| tree | fc9216b00df2e629b019127b6ab7e795fc9b5049 /include/uapi/linux | |
| parent | 05bd97fc559df4d26e33b0714b5327de8f610971 (diff) | |
| parent | 0999f021c988770a37edfb266027db9c413901fd (diff) | |
| download | linux-2bdea157b99903c8d344dbae44fedf033db4e2c2.tar.xz | |
Merge branch 'sctp-fully-support-for-dscp-and-flowlabel-per-transport'
Xin Long says:
====================
sctp: fully support for dscp and flowlabel per transport
Now dscp and flowlabel are set from sock when sending the packets,
but being multi-homing, sctp also supports for dscp and flowlabel
per transport, which is described in section 8.1.12 in RFC6458.
v1->v2:
- define ip_queue_xmit as inline in net/ip.h, instead of exporting
it in Patch 1/5 according to David's suggestion.
- fix the param len check in sctp_s/getsockopt_peer_addr_params()
in Patch 3/5 to guarantee that an old app built with old kernel
headers could work on the newer kernel per Marcelo's point.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/sctp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index c02986a284db..b479db5c71d9 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -763,6 +763,8 @@ enum sctp_spp_flags { SPP_SACKDELAY_DISABLE = 1<<6, /*Disable SACK*/ SPP_SACKDELAY = SPP_SACKDELAY_ENABLE | SPP_SACKDELAY_DISABLE, SPP_HB_TIME_IS_ZERO = 1<<7, /* Set HB delay to 0 */ + SPP_IPV6_FLOWLABEL = 1<<8, + SPP_DSCP = 1<<9, }; struct sctp_paddrparams { @@ -773,6 +775,8 @@ struct sctp_paddrparams { __u32 spp_pathmtu; __u32 spp_sackdelay; __u32 spp_flags; + __u32 spp_ipv6_flowlabel; + __u8 spp_dscp; } __attribute__((packed, aligned(4))); /* |