diff options
author | John Fastabend <john.fastabend@gmail.com> | 2017-08-16 15:02:32 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-08-16 15:34:13 -0700 |
commit | 6bdc9c4c31c81688e19cb186d49be01bbb6a1618 (patch) | |
tree | 4757c35f412230312d7c5b36bd50add6e590224d /include/linux/bpf_types.h | |
parent | cf56e3b98c5358883c8df5ed8e04661481225a8f (diff) | |
download | linux-6bdc9c4c31c81688e19cb186d49be01bbb6a1618.tar.gz linux-6bdc9c4c31c81688e19cb186d49be01bbb6a1618.tar.bz2 linux-6bdc9c4c31c81688e19cb186d49be01bbb6a1618.zip |
bpf: sock_map fixes for !CONFIG_BPF_SYSCALL and !STREAM_PARSER
Resolve issues with !CONFIG_BPF_SYSCALL and !STREAM_PARSER
net/core/filter.c: In function ‘do_sk_redirect_map’:
net/core/filter.c:1881:3: error: implicit declaration of function ‘__sock_map_lookup_elem’ [-Werror=implicit-function-declaration]
sk = __sock_map_lookup_elem(ri->map, ri->ifindex);
^
net/core/filter.c:1881:6: warning: assignment makes pointer from integer without a cast [enabled by default]
sk = __sock_map_lookup_elem(ri->map, ri->ifindex);
Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support")
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bpf_types.h')
-rw-r--r-- | include/linux/bpf_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h index fa805074d168..6f1a567667b8 100644 --- a/include/linux/bpf_types.h +++ b/include/linux/bpf_types.h @@ -38,5 +38,7 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY_OF_MAPS, array_of_maps_map_ops) BPF_MAP_TYPE(BPF_MAP_TYPE_HASH_OF_MAPS, htab_of_maps_map_ops) #ifdef CONFIG_NET BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops) +#ifdef CONFIG_STREAM_PARSER BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKMAP, sock_map_ops) #endif +#endif |