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/netfilter | |
parent | cd967e05715489c5d1059d8d3012c747e5cfb1c4 (diff) | |
download | op-kernel-dev-e32123e59871b9389d5b3fe9318611c7f1d1307a.zip op-kernel-dev-e32123e59871b9389d5b3fe9318611c7f1d1307a.tar.gz |
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/netfilter')
-rw-r--r-- | net/netfilter/nfnetlink_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 1a0be2a..50aaf71 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -824,7 +824,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, inst = instance_create(net, group_num, NETLINK_CB(skb).portid, - sk_user_ns(NETLINK_CB(skb).ssk)); + sk_user_ns(NETLINK_CB(skb).sk)); if (IS_ERR(inst)) { ret = PTR_ERR(inst); goto out; |