diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-29 15:53:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-29 15:53:35 -0800 |
| commit | 9f0ca0c1a50a7de5c71970aa452941199ed210d9 (patch) | |
| tree | b7e19ab2e5bbc951141fb90489923b50b8f263f3 /net/sctp | |
| parent | 9a834f9b04bc5ed2db27eb45b0cc6415ce7c314c (diff) | |
| parent | 812285fa5ab129e3a55682314bf235f701564310 (diff) | |
| download | linux-stable-9f0ca0c1a50a7de5c71970aa452941199ed210d9.tar.gz linux-stable-9f0ca0c1a50a7de5c71970aa452941199ed210d9.tar.bz2 linux-stable-9f0ca0c1a50a7de5c71970aa452941199ed210d9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-02-28
The following pull-request contains BPF updates for your *net-next* tree.
We've added 41 non-merge commits during the last 7 day(s) which contain
a total of 49 files changed, 1383 insertions(+), 499 deletions(-).
The main changes are:
1) BPF and Real-Time nicely co-exist.
2) bpftool feature improvements.
3) retrieve bpf_sk_storage via INET_DIAG.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/diag.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 8a15146faaeb..69743a6aaf6f 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -432,11 +432,12 @@ static void sctp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, sctp_get_sctp_info(sk, infox->asoc, infox->sctpinfo); } -static int sctp_diag_dump_one(struct sk_buff *in_skb, - const struct nlmsghdr *nlh, +static int sctp_diag_dump_one(struct netlink_callback *cb, const struct inet_diag_req_v2 *req) { + struct sk_buff *in_skb = cb->skb; struct net *net = sock_net(in_skb->sk); + const struct nlmsghdr *nlh = cb->nlh; union sctp_addr laddr, paddr; struct sctp_comm_param commp = { .skb = in_skb, @@ -470,7 +471,7 @@ static int sctp_diag_dump_one(struct sk_buff *in_skb, } static void sctp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, - const struct inet_diag_req_v2 *r, struct nlattr *bc) + const struct inet_diag_req_v2 *r) { u32 idiag_states = r->idiag_states; struct net *net = sock_net(skb->sk); |