diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-17 02:46:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:57:56 -0400 |
commit | e32123e59871b9389d5b3fe9318611c7f1d1307a (patch) | |
tree | 1a16fcf51b79c5a6a955139e8829aef55fdc3880 /net/ipv4/inet_diag.c | |
parent | cd967e05715489c5d1059d8d3012c747e5cfb1c4 (diff) |
netlink: rename ssk to sk in struct netlink_skb_params
Memory mapped netlink needs to store the receiving userspace socket
when sending from the kernel to userspace. Rename 'ssk' to 'sk' to
avoid confusion.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
-rw-r--r-- | net/ipv4/inet_diag.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 8620408af574..5f648751fce2 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
@@ -324,7 +324,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s | |||
324 | } | 324 | } |
325 | 325 | ||
326 | err = sk_diag_fill(sk, rep, req, | 326 | err = sk_diag_fill(sk, rep, req, |
327 | sk_user_ns(NETLINK_CB(in_skb).ssk), | 327 | sk_user_ns(NETLINK_CB(in_skb).sk), |
328 | NETLINK_CB(in_skb).portid, | 328 | NETLINK_CB(in_skb).portid, |
329 | nlh->nlmsg_seq, 0, nlh); | 329 | nlh->nlmsg_seq, 0, nlh); |
330 | if (err < 0) { | 330 | if (err < 0) { |
@@ -630,7 +630,7 @@ static int inet_csk_diag_dump(struct sock *sk, | |||
630 | return 0; | 630 | return 0; |
631 | 631 | ||
632 | return inet_csk_diag_fill(sk, skb, r, | 632 | return inet_csk_diag_fill(sk, skb, r, |
633 | sk_user_ns(NETLINK_CB(cb->skb).ssk), | 633 | sk_user_ns(NETLINK_CB(cb->skb).sk), |
634 | NETLINK_CB(cb->skb).portid, | 634 | NETLINK_CB(cb->skb).portid, |
635 | cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); | 635 | cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); |
636 | } | 636 | } |
@@ -805,7 +805,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk, | |||
805 | } | 805 | } |
806 | 806 | ||
807 | err = inet_diag_fill_req(skb, sk, req, | 807 | err = inet_diag_fill_req(skb, sk, req, |
808 | sk_user_ns(NETLINK_CB(cb->skb).ssk), | 808 | sk_user_ns(NETLINK_CB(cb->skb).sk), |
809 | NETLINK_CB(cb->skb).portid, | 809 | NETLINK_CB(cb->skb).portid, |
810 | cb->nlh->nlmsg_seq, cb->nlh); | 810 | cb->nlh->nlmsg_seq, cb->nlh); |
811 | if (err < 0) { | 811 | if (err < 0) { |