diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-07-13 20:55:48 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-07-13 20:59:25 -0700 |
| commit | f7d40ee7eff8fde2b0701b80c2aa3ba354f8f520 (patch) | |
| tree | a6a6f2e3e6710b5c863b463b070969b71ae7f34d /tools/testing/selftests | |
| parent | 07dd1b7e68e4b83a1004b14dffd7e142c0bc79bd (diff) | |
selftests/bpf: Fix merge conflict resolution
Remove double definition of structs.
Fixes: 71930d61025e ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests')
| -rw-r--r-- | tools/testing/selftests/bpf/progs/bpf_iter_netlink.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_netlink.c b/tools/testing/selftests/bpf/progs/bpf_iter_netlink.c index b9c2756c5c97..7de98a68599a 100644 --- a/tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +++ b/tools/testing/selftests/bpf/progs/bpf_iter_netlink.c @@ -7,20 +7,6 @@ char _license[] SEC("license") = "GPL"; -#define sk_rmem_alloc sk_backlog.rmem_alloc -#define sk_refcnt __sk_common.skc_refcnt - -struct bpf_iter_meta { - struct seq_file *seq; - __u64 session_id; - __u64 seq_num; -} __attribute__((preserve_access_index)); - -struct bpf_iter__netlink { - struct bpf_iter_meta *meta; - struct netlink_sock *sk; -} __attribute__((preserve_access_index)); - static __attribute__((noinline)) struct inode *SOCK_INODE(struct socket *socket) { return &container_of(socket, struct socket_alloc, socket)->vfs_inode; |