History

Merge tag 'asoc-v6.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v6.18 round 2 Some more updates for v6.18, mostly fixes for the earlier pull request with some cleanups and more minor fixes for older code. We do have one new driver, the TI TAS2783A, and some quirks for new platforms.

Takashi Iwai committed 1 year ago

Commit 6b9c4a02 parents a767d35 f8b9c81242 files · +4173 −1029Browse files

Showing the changes to include/uapi (2 of 242 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/mptcp.h +2 −0
  2. include/uapi/linux/mptcp_pm.h +2 −2
include/uapi/linux/mptcp.h+2−0
@@ -31,6 +31,8 @@ · 30 unmodified lines
31#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)31#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)
32#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)32#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)
33 33
34#define MPTCP_PM_EV_FLAG_DENY_JOIN_ID0 _BITUL(0)
35
34#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)36#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)
35#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)37#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)
36#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2)38#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2)
include/uapi/linux/mptcp_pm.h+2−2
@@ -16,10 +16,10 @@ · 15 unmodified lines
16 * good time to allocate memory and send ADD_ADDR if needed. Depending on the16 * good time to allocate memory and send ADD_ADDR if needed. Depending on the
17 * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED17 * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED
18 * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,18 * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
19 * sport, dport, server-side.19 * sport, dport, server-side, [flags].
20 * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new20 * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new
21 * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,21 * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
22 * sport, dport, server-side.22 * sport, dport, server-side, [flags].
23 * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.23 * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.
24 * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.24 * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.
25 * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].25 * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].