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/udp_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/udp_diag.c')
-rw-r--r-- | net/ipv4/udp_diag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c index 369a781851ad..7927db0a9279 100644 --- a/net/ipv4/udp_diag.c +++ b/net/ipv4/udp_diag.c | |||
@@ -25,7 +25,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, | |||
25 | return 0; | 25 | return 0; |
26 | 26 | ||
27 | return inet_sk_diag_fill(sk, NULL, skb, req, | 27 | return inet_sk_diag_fill(sk, NULL, skb, req, |
28 | sk_user_ns(NETLINK_CB(cb->skb).ssk), | 28 | sk_user_ns(NETLINK_CB(cb->skb).sk), |
29 | NETLINK_CB(cb->skb).portid, | 29 | NETLINK_CB(cb->skb).portid, |
30 | cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); | 30 | cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); |
31 | } | 31 | } |
@@ -71,7 +71,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, | |||
71 | goto out; | 71 | goto out; |
72 | 72 | ||
73 | err = inet_sk_diag_fill(sk, NULL, rep, req, | 73 | err = inet_sk_diag_fill(sk, NULL, rep, req, |
74 | sk_user_ns(NETLINK_CB(in_skb).ssk), | 74 | sk_user_ns(NETLINK_CB(in_skb).sk), |
75 | NETLINK_CB(in_skb).portid, | 75 | NETLINK_CB(in_skb).portid, |
76 | nlh->nlmsg_seq, 0, nlh); | 76 | nlh->nlmsg_seq, 0, nlh); |
77 | if (err < 0) { | 77 | if (err < 0) { |