diff options
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index cee6674a3bf4..1fd1c8b5ce03 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -3257,8 +3257,8 @@ out: | |||
3257 | } | 3257 | } |
3258 | EXPORT_SYMBOL(tipc_nl_sk_walk); | 3258 | EXPORT_SYMBOL(tipc_nl_sk_walk); |
3259 | 3259 | ||
3260 | int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct tipc_sock *tsk, | 3260 | int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct netlink_callback *cb, |
3261 | u32 sk_filter_state, | 3261 | struct tipc_sock *tsk, u32 sk_filter_state, |
3262 | u64 (*tipc_diag_gen_cookie)(struct sock *sk)) | 3262 | u64 (*tipc_diag_gen_cookie)(struct sock *sk)) |
3263 | { | 3263 | { |
3264 | struct sock *sk = &tsk->sk; | 3264 | struct sock *sk = &tsk->sk; |
@@ -3280,7 +3280,7 @@ int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct tipc_sock *tsk, | |||
3280 | nla_put_u32(skb, TIPC_NLA_SOCK_TIPC_STATE, (u32)sk->sk_state) || | 3280 | nla_put_u32(skb, TIPC_NLA_SOCK_TIPC_STATE, (u32)sk->sk_state) || |
3281 | nla_put_u32(skb, TIPC_NLA_SOCK_INO, sock_i_ino(sk)) || | 3281 | nla_put_u32(skb, TIPC_NLA_SOCK_INO, sock_i_ino(sk)) || |
3282 | nla_put_u32(skb, TIPC_NLA_SOCK_UID, | 3282 | nla_put_u32(skb, TIPC_NLA_SOCK_UID, |
3283 | from_kuid_munged(sk_user_ns(NETLINK_CB(skb).sk), | 3283 | from_kuid_munged(sk_user_ns(NETLINK_CB(cb->skb).sk), |
3284 | sock_i_uid(sk))) || | 3284 | sock_i_uid(sk))) || |
3285 | nla_put_u64_64bit(skb, TIPC_NLA_SOCK_COOKIE, | 3285 | nla_put_u64_64bit(skb, TIPC_NLA_SOCK_COOKIE, |
3286 | tipc_diag_gen_cookie(sk), | 3286 | tipc_diag_gen_cookie(sk), |