From patchwork Fri Oct 10 03:37:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li RongQing X-Patchwork-Id: 398437 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 26EFF1400AA for ; Fri, 10 Oct 2014 14:37:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751219AbaJJDhV (ORCPT ); Thu, 9 Oct 2014 23:37:21 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:55187 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099AbaJJDhT (ORCPT ); Thu, 9 Oct 2014 23:37:19 -0400 Received: by mail-pa0-f48.google.com with SMTP id eu11so897870pac.35 for ; Thu, 09 Oct 2014 20:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=ZT1bQ5rLBRXLiEK8+5QNsUksmYYaE0jHsb09DesyfjM=; b=LjNUfUFDeoqZVT5MnoTt7ahuaOD91EZdWzV+gjTNLeiXkxAJWJx5/xX9i2UE5//t43 OKlBxbTuGrsSFF5ig6VACc+O0B/Tvf/XIXFeZe5uIoRZQ3pjYrFf2dbeFtV35uESIK9m myRObXQgjP4+WQO+KTKJwkxgcfgvcH65LWib6Nl2QYiz/41/jQobGXEE3m2IDpoGWvug LC0hijX4bgSH9HliWjkDZMXDIQDF7DMoVTgrnuL+gkFJI2Y/S6DCvBbsXdxpi2AhXW41 Qu+n9LjqIsSFnZfuuIZKZU6Q2H5kCY8QKIoF1dP6LowhBUcwrwIGEjaztUg7leLXASgN Dsqw== X-Received: by 10.66.140.8 with SMTP id rc8mr2140578pab.75.1412912237750; Thu, 09 Oct 2014 20:37:17 -0700 (PDT) Received: from localhost ([106.120.101.38]) by mx.google.com with ESMTPSA id on3sm1873013pdb.71.2014.10.09.20.37.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 Oct 2014 20:37:17 -0700 (PDT) From: roy.qing.li@gmail.com To: netdev@vger.kernel.org Subject: [PATCH][net-next] net: filter: replace sk_run_filter with __bpf_prog_run in comments Date: Fri, 10 Oct 2014 11:37:11 +0800 Message-Id: <1412912231-1004-1-git-send-email-roy.qing.li@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing sk_run_filter has been renamed as __bpf_prog_run, so replace them in comments Signed-off-by: Li RongQing --- net/core/filter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index fcd3f67..9324601 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -51,9 +51,9 @@ * @skb: buffer to filter * * Run the filter code and then cut skb->data to correct size returned by - * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller + * __bpf_prog_run. If pkt_len is 0 we toss packet. If skb->len is smaller * than pkt_len we keep whole skb->data. This is the socket level - * wrapper to sk_run_filter. It returns 0 if the packet should + * wrapper to __bpf_prog_run. It returns 0 if the packet should * be accepted or -EPERM if the packet should be tossed. * */ @@ -567,10 +567,10 @@ err: /* Security: * * A BPF program is able to use 16 cells of memory to store intermediate - * values (check u32 mem[BPF_MEMWORDS] in sk_run_filter()). + * values (check u32 mem[BPF_MEMWORDS] in __bpf_prog_run()). * * As we dont want to clear mem[] array for each packet going through - * sk_run_filter(), we check that filter loaded by user never try to read + * __bpf_prog_run(), we check that filter loaded by user never try to read * a cell if not previously written, and we check all branches to be sure * a malicious user doesn't try to abuse us. */