]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'sctp-fully-support-for-dscp-and-flowlabel-per-transport'
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Jul 2018 02:36:55 +0000 (11:36 +0900)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jul 2018 02:36:55 +0000 (11:36 +0900)
commit78bbcd7b4a5fca79f536a805e1a81143a6b42b27
treefc9216b00df2e629b019127b6ab7e795fc9b5049
parent6113d576fe22437401ac09d0e42cb0511446bc13
parentb3aa94fd4741dbc21f5235479113e96d7d5bd7e3
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>