OSDN Git Service

Merge branch 'sctp-add-support-for-some-sctp-auth-APIs-from-RFC6458'
authorDavid S. Miller <davem@davemloft.net>
Wed, 14 Mar 2018 17:48:28 +0000 (13:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 Mar 2018 17:48:28 +0000 (13:48 -0400)
commitc292566a7779f88ed63d555b1015ab29ca0d5530
treef5f0ff6a3f3620a169a88efe896a902daea2bb9a
parentc469012729bda6515779590d9588d3e36fdf449d
parent30f6ebf65bc46161c5aaff1db2e6e7c76aa4a06b
Merge branch 'sctp-add-support-for-some-sctp-auth-APIs-from-RFC6458'

Xin Long says:

====================
sctp: add support for some sctp auth APIs from RFC6458

This patchset mainly adds support for SCTP AUTH Information for sendmsg,
described in RFC6458:

    5.3.8.  SCTP AUTH Information Structure (SCTP_AUTHINFO)

and also adds a sockopt described in RFC6458:

    8.3.4.  Deactivate a Shared Key (SCTP_AUTH_DEACTIVATE_KEY)

and two types of events for AUTHENTICATION_EVENT described in RFC6458:

    6.1.8.  SCTP_AUTHENTICATION_EVENT:
             - SCTP_AUTH_NO_AUTH
             - SCTP_AUTH_FREE_KEY

After this patchset, we have fully support for sctp_sendv in kernel.

Note that this patchset won't touch that sctp options merge conflict.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>