diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-17 06:46:57 +0000 |
|---|---|---|
| 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) | |
| download | talos-obmc-linux-e32123e59871b9389d5b3fe9318611c7f1d1307a.tar.gz talos-obmc-linux-e32123e59871b9389d5b3fe9318611c7f1d1307a.zip | |
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, return 0; return inet_sk_diag_fill(sk, NULL, skb, req, - sk_user_ns(NETLINK_CB(cb->skb).ssk), + sk_user_ns(NETLINK_CB(cb->skb).sk), NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); } @@ -71,7 +71,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, goto out; err = inet_sk_diag_fill(sk, NULL, rep, req, - sk_user_ns(NETLINK_CB(in_skb).ssk), + sk_user_ns(NETLINK_CB(in_skb).sk), NETLINK_CB(in_skb).portid, nlh->nlmsg_seq, 0, nlh); if (err < 0) { |
