Commit f7d40ee7 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

selftests/bpf: Fix merge conflict resolution

Remove double definition of structs.

Fixes: 71930d61 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net"

)
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 07dd1b7e
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -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;