diff for duplicates of <20200511185218.1422406-3-jakub@cloudflare.com>
diff --git a/a/1.txt b/N1/1.txt
index 42408e3..b679fd8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -224,7 +224,7 @@ index de2a75500233..e2478f4270af 100644
return -EINVAL;
}
+ case BPF_PROG_TYPE_SK_LOOKUP:
-+ if (expected_attach_type == BPF_SK_LOOKUP)
++ if (expected_attach_type = BPF_SK_LOOKUP)
+ return 0;
+ return -EINVAL;
case BPF_PROG_TYPE_EXT:
@@ -235,7 +235,7 @@ index de2a75500233..e2478f4270af 100644
case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
case BPF_PROG_TYPE_CGROUP_SOCKOPT:
+ case BPF_PROG_TYPE_SK_LOOKUP:
- return attach_type == prog->expected_attach_type ? 0 : -EINVAL;
+ return attach_type = prog->expected_attach_type ? 0 : -EINVAL;
case BPF_PROG_TYPE_CGROUP_SKB:
return prog->enforce_expected_attach_type &&
@@ -2731,6 +2736,8 @@ attach_type_to_prog_type(enum bpf_attach_type attach_type)
@@ -347,7 +347,7 @@ index 48ed970f4ae1..8ea17eda6ff2 100644
+ if (sk->sk_protocol != ctx->protocol)
+ return -EPROTOTYPE;
+ if (sk->sk_family != ctx->family &&
-+ (sk->sk_family == AF_INET || ipv6_only_sock(sk)))
++ (sk->sk_family = AF_INET || ipv6_only_sock(sk)))
+ return -EAFNOSUPPORT;
+
+ /* Select socket as lookup result */
@@ -569,8 +569,8 @@ index ded304c96a05..4a6653c64210 100755
for i, a in enumerate(proto['args']):
t = a['type']
n = a['name']
-- if proto['name'] == 'bpf_get_socket_cookie' and i == 0:
-+ if proto['name'] in self.overloaded_helpers and i == 0:
+- if proto['name'] = 'bpf_get_socket_cookie' and i = 0:
++ if proto['name'] in self.overloaded_helpers and i = 0:
t = 'void'
n = 'ctx'
one_arg = '{}{}'.format(comma, self.map_type(t))
diff --git a/a/content_digest b/N1/content_digest
index 5042f3e..57814be 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,3 @@
-[
- "ref\00020200511185218.1422406-1-jakub\@cloudflare.com\0"
-]
[
"From\0Jakub Sitnicki <jakub\@cloudflare.com>\0"
]
@@ -8,25 +5,10 @@
"Subject\0[PATCH bpf-next v2 02/17] bpf: Introduce SK_LOOKUP program type with a dedicated attach point\0"
]
[
- "Date\0Mon, 11 May 2020 20:52:03 +0200\0"
-]
-[
- "To\0netdev\@vger.kernel.org",
- " bpf\@vger.kernel.org\0"
+ "Date\0Mon, 11 May 2020 18:52:03 +0000\0"
]
[
- "Cc\0dccp\@vger.kernel.org",
- " kernel-team\@cloudflare.com",
- " Alexei Starovoitov <ast\@kernel.org>",
- " Daniel Borkmann <daniel\@iogearbox.net>",
- " David S. Miller <davem\@davemloft.net>",
- " Eric Dumazet <edumazet\@google.com>",
- " Gerrit Renker <gerrit\@erg.abdn.ac.uk>",
- " Jakub Kicinski <kuba\@kernel.org>",
- " Andrii Nakryiko <andrii.nakryiko\@gmail.com>",
- " Martin KaFai Lau <kafai\@fb.com>",
- " Marek Majkowski <marek\@cloudflare.com>",
- " Lorenz Bauer <lmb\@cloudflare.com>\0"
+ "To\0dccp\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -261,7 +243,7 @@
" \t\t\treturn -EINVAL;\n",
" \t\t}\n",
"+\tcase BPF_PROG_TYPE_SK_LOOKUP:\n",
- "+\t\tif (expected_attach_type == BPF_SK_LOOKUP)\n",
+ "+\t\tif (expected_attach_type = BPF_SK_LOOKUP)\n",
"+\t\t\treturn 0;\n",
"+\t\treturn -EINVAL;\n",
" \tcase BPF_PROG_TYPE_EXT:\n",
@@ -272,7 +254,7 @@
" \tcase BPF_PROG_TYPE_CGROUP_SOCK_ADDR:\n",
" \tcase BPF_PROG_TYPE_CGROUP_SOCKOPT:\n",
"+\tcase BPF_PROG_TYPE_SK_LOOKUP:\n",
- " \t\treturn attach_type == prog->expected_attach_type ? 0 : -EINVAL;\n",
+ " \t\treturn attach_type = prog->expected_attach_type ? 0 : -EINVAL;\n",
" \tcase BPF_PROG_TYPE_CGROUP_SKB:\n",
" \t\treturn prog->enforce_expected_attach_type &&\n",
"\@\@ -2731,6 +2736,8 \@\@ attach_type_to_prog_type(enum bpf_attach_type attach_type)\n",
@@ -384,7 +366,7 @@
"+\tif (sk->sk_protocol != ctx->protocol)\n",
"+\t\treturn -EPROTOTYPE;\n",
"+\tif (sk->sk_family != ctx->family &&\n",
- "+\t (sk->sk_family == AF_INET || ipv6_only_sock(sk)))\n",
+ "+\t (sk->sk_family = AF_INET || ipv6_only_sock(sk)))\n",
"+\t\treturn -EAFNOSUPPORT;\n",
"+\n",
"+\t/* Select socket as lookup result */\n",
@@ -606,8 +588,8 @@
" for i, a in enumerate(proto['args']):\n",
" t = a['type']\n",
" n = a['name']\n",
- "- if proto['name'] == 'bpf_get_socket_cookie' and i == 0:\n",
- "+ if proto['name'] in self.overloaded_helpers and i == 0:\n",
+ "- if proto['name'] = 'bpf_get_socket_cookie' and i = 0:\n",
+ "+ if proto['name'] in self.overloaded_helpers and i = 0:\n",
" t = 'void'\n",
" n = 'ctx'\n",
" one_arg = '{}{}'.format(comma, self.map_type(t))\n",
@@ -615,4 +597,4 @@
"2.25.3"
]
-1be9814d9e93f182fe316f22ce55eec63614778ab765240768c76750c1569144
+2da48733ce9465b681fcb498e1a09a8a80f8e947bd456faa781e0a990adeab30
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.