aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_request.c
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2021-04-27 19:45:19 +0000
committerPablo Neira Ayuso <[email protected]>2021-04-27 20:34:05 +0000
commit7acc0bb490c85012bcbda142b6755fd1fdf1fba1 (patch)
treeafa1f67dbeb4b2e9459caaae6767db83d0419bab /net/bluetooth/hci_request.c
parentnetfilter: nft_socket: fix an unused variable warning (diff)
downloadkernel-7acc0bb490c85012bcbda142b6755fd1fdf1fba1.tar.gz
kernel-7acc0bb490c85012bcbda142b6755fd1fdf1fba1.zip
netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n
In some configurations, the sock_cgroup_ptr() function is not available: net/netfilter/nft_socket.c: In function 'nft_sock_get_eval_cgroupv2': net/netfilter/nft_socket.c:47:16: error: implicit declaration of function 'sock_cgroup_ptr'; did you mean 'obj_cgroup_put'? [-Werror=implicit-function-declaration] 47 | cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data); | ^~~~~~~~~~~~~~~ | obj_cgroup_put net/netfilter/nft_socket.c:47:14: error: assignment to 'struct cgroup *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] 47 | cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data); | ^ Change the caller to match the same #ifdef check, only calling it when the function is defined. Fixes: e0bb96db96f8 ("netfilter: nft_socket: add support for cgroupsv2") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
Diffstat (limited to 'net/bluetooth/hci_request.c')
0 files changed, 0 insertions, 0 deletions