diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
| commit | 0f96371a30f16f6244195c717b9e2b2f42aa4e89 (patch) | |
| tree | 3f42b4abf3a7643ddd06f0c7727f2e3b06798c3c /net/sctp/diag.c | |
| parent | e021bb4fb77a8782d21cab4cb0702778fc3784c7 (diff) | |
| parent | ce194fa2b267e2018f42442347d90df01c4071d6 (diff) | |
Merge tag 'v4.19.29' into v4.19-rt
This is the 4.19.29 stable release
Conflicts:
drivers/irqchip/irq-gic-v3-its.c
Diffstat (limited to 'net/sctp/diag.c')
| -rw-r--r-- | net/sctp/diag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 078f01a8d582..435847d98b51 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -256,6 +256,7 @@ static size_t inet_assoc_attr_size(struct sctp_association *asoc) + nla_total_size(1) /* INET_DIAG_TOS */ + nla_total_size(1) /* INET_DIAG_TCLASS */ + nla_total_size(4) /* INET_DIAG_MARK */ + + nla_total_size(4) /* INET_DIAG_CLASS_ID */ + nla_total_size(addrlen * asoc->peer.transport_count) + nla_total_size(addrlen * addrcnt) + nla_total_size(sizeof(struct inet_diag_meminfo)) |