From patchwork Tue Apr 18 09:27:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Klauser X-Patchwork-Id: 751747 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w6fvJ5n2mz9rxm for ; Tue, 18 Apr 2017 19:28:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756394AbdDRJ2W (ORCPT ); Tue, 18 Apr 2017 05:28:22 -0400 Received: from mail.zhinst.com ([212.126.164.98]:41118 "EHLO mail.zhinst.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400AbdDRJ1G (ORCPT ); Tue, 18 Apr 2017 05:27:06 -0400 Received: from ziws08.zhinst.com ([10.42.0.7]) by mail.zhinst.com (Kerio Connect 9.2.2 patch 1) with ESMTP; Tue, 18 Apr 2017 11:27:00 +0200 From: Tobias Klauser To: netdev@vger.kernel.org Cc: Daniel Borkmann , Alexei Starovoitov Subject: [PATCH net-next] bpf: remove reference to sock_filter_ext from kerneldoc comment Date: Tue, 18 Apr 2017 11:27:00 +0200 Message-Id: <20170418092700.9157-1-tklauser@distanz.ch> X-Mailer: git-send-email 2.12.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Daniel Borkmann Acked-by: Alexei Starovoitov --- net/core/filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: