diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-07 18:06:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-07 18:06:19 -0800 |
| commit | f06f095f3294f8e6357bd2ec30844f125981bc6a (patch) | |
| tree | 4789334e9cd775ba44fc17f163f450d279b72a87 /net/smc/smc_diag.c | |
| parent | net: vxlan: Free a leaked vetoed multicast rdst (diff) | |
| parent | net/smc: original socket family in inet_sock_diag (diff) | |
| download | linux-dev-f06f095f3294f8e6357bd2ec30844f125981bc6a.tar.xz linux-dev-f06f095f3294f8e6357bd2ec30844f125981bc6a.zip | |
Merge branch 'smc-next'
Ursula Braun says:
====================
net/smc: patches 2019-02-07
here are patches for SMC:
* patches 1, 3, and 6 are cleanups without functional change
* patch 2 postpones closing of internal clcsock
* patches 4 and 5 improve link group creation locking
* patch 7 restores AF_SMC as diag_family field
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_diag.c')
| -rw-r--r-- | net/smc/smc_diag.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c index dbf64a93d68a..371b4cf31fcd 100644 --- a/net/smc/smc_diag.c +++ b/net/smc/smc_diag.c @@ -38,6 +38,7 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) { struct smc_sock *smc = smc_sk(sk); + r->diag_family = sk->sk_family; if (!smc->clcsock) return; r->id.idiag_sport = htons(smc->clcsock->sk->sk_num); @@ -45,14 +46,12 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if; sock_diag_save_cookie(sk, r->id.idiag_cookie); if (sk->sk_protocol == SMCPROTO_SMC) { - r->diag_family = PF_INET; memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); r->id.idiag_src[0] = smc->clcsock->sk->sk_rcv_saddr; r->id.idiag_dst[0] = smc->clcsock->sk->sk_daddr; #if IS_ENABLED(CONFIG_IPV6) } else if (sk->sk_protocol == SMCPROTO_SMC6) { - r->diag_family = PF_INET6; memcpy(&r->id.idiag_src, &smc->clcsock->sk->sk_v6_rcv_saddr, sizeof(smc->clcsock->sk->sk_v6_rcv_saddr)); memcpy(&r->id.idiag_dst, &smc->clcsock->sk->sk_v6_daddr, |