diff mbox

[net-next] bpf: remove reference to sock_filter_ext from kerneldoc comment

Message ID 20170418092700.9157-1-tklauser@distanz.ch
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Tobias Klauser April 18, 2017, 9:27 a.m. UTC
struct sock_filter_ext didn't make it into the tree and is now called
struct bpf_insn. Reword the kerneldoc comment for bpf_convert_filter()
accordingly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 net/core/filter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Daniel Borkmann April 18, 2017, 9:34 a.m. UTC | #1
On 04/18/2017 11:27 AM, Tobias Klauser wrote:
> struct sock_filter_ext didn't make it into the tree and is now called
> struct bpf_insn. Reword the kerneldoc comment for bpf_convert_filter()
> accordingly.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Good point, thanks!

Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Alexei Starovoitov April 18, 2017, 5:50 p.m. UTC | #2
On 4/18/17 2:34 AM, Daniel Borkmann wrote:
> On 04/18/2017 11:27 AM, Tobias Klauser wrote:
>> struct sock_filter_ext didn't make it into the tree and is now called
>> struct bpf_insn. Reword the kerneldoc comment for bpf_convert_filter()
>> accordingly.
>>
>> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
>
> Good point, thanks!
>
> Acked-by: Daniel Borkmann <daniel@iogearbox.net>

good ol' days :)
let it rip.

Acked-by: Alexei Starovoitov <ast@kernel.org>
David Miller April 20, 2017, 7:27 p.m. UTC | #3
From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 18 Apr 2017 11:27:00 +0200

> struct sock_filter_ext didn't make it into the tree and is now called
> struct bpf_insn. Reword the kerneldoc comment for bpf_convert_filter()
> accordingly.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Applied, thank you.
diff mbox

Patch

diff --git a/net/core/filter.c b/net/core/filter.c
index ce2a19da8aa4..42a7f08b609f 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -354,7 +354,8 @@  static bool convert_bpf_extensions(struct sock_filter *fp,
  *	@new_prog: buffer where converted program will be stored
  *	@new_len: pointer to store length of converted program
  *
- * Remap 'sock_filter' style BPF instruction set to 'sock_filter_ext' style.
+ * Remap 'sock_filter' style classic BPF (cBPF) instruction set to 'bpf_insn'
+ * style extended BPF (eBPF).
  * Conversion workflow:
  *
  * 1) First pass for calculating the new program length: