From patchwork Sun Apr 8 15:00:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 896037 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V2zAytcv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40JxTG4X4Hz9s31 for ; Mon, 9 Apr 2018 01:01:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751886AbeDHPBG (ORCPT ); Sun, 8 Apr 2018 11:01:06 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35506 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751662AbeDHPBF (ORCPT ); Sun, 8 Apr 2018 11:01:05 -0400 Received: by mail-pf0-f195.google.com with SMTP id u86so4186635pfd.2 for ; Sun, 08 Apr 2018 08:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rvzYBRS1+aSfOg8DEj82KE4eiltpLI20+DMj9ZXctes=; b=V2zAytcvCmQGCHHcxmlw9BqRKSYmDbMiw9qmKH+RXe6T5Rk0/6lsLgxV9ni47E8m3A ryV2AQOfnWORiBjsh8ggrNyhc8G3KLqvR9dR3LfkmTBNzzK/8YmLSiSZnd4i8jS10zmV ebdL0n+lEuh/6xDoK6z/wuzrJPWRmfYLLWoZ+6Dq7QyS7Sjb+WscxNOuEyl0AwLMdqYr Bqo93MOYGelv4wIpoa6a1NIgH14ba6kSHfShdMFpFj8V0Zuj8kD7IDVqjne4f4LeQT6C hrJUP5g1RZOsfPYPFC6RP/XZ3ubixfXbvhpP0Yj/AY6ksYsxUD5x+su7vsyPICQQT6FG spyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rvzYBRS1+aSfOg8DEj82KE4eiltpLI20+DMj9ZXctes=; b=mwEm+gHtGOZ7vVmXnNbN0FbtP9yt87uHXnKkdGSPDe02EeogPBhIA907H6SLuNiqgD XzJCXBDy9eKFUr88W1KTnkjUma78QtItEVu+Ivmkwkpst9k+ylPvRHRDrtFrteALFd0/ Cx1qVrTKmWNNHONjHJ/jnWkUJPDyMbkAFBqe1wPuuXt4k8/8EFfbNDXIt27OopoM9+st 9rT4Y3t6TYmX4+nUQ9C4HM3xW5sYF1w+cB/gvuHIBXNw6ee5Z9WwTblXL/Flj/Z57f3T AKLWfNWAfChdaWDwuV1aqx6sT3gpyp84ejYrIMYMjtZQ9I0Cy/GgMaJdXdfaPdfi4d47 aNWw== X-Gm-Message-State: AElRT7H3MPRRma+04gBT/uXcO7uSn6iiKTA395IEr5PPkQZcm5cpyucB XcnH2iXQnt/eGNrX9fGOR7RTDA== X-Google-Smtp-Source: AIpwx49Lr4RvaoY1KN2+Av5B6u5MJvD42rSPV9IWQdsqFhh1udxyIy9bcRXo5gieB3molqiZRionQA== X-Received: by 10.98.141.205 with SMTP id p74mr26384111pfk.210.1523199664548; Sun, 08 Apr 2018 08:01:04 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([125.130.197.10]) by smtp.gmail.com with ESMTPSA id 189sm29981885pfu.44.2018.04.08.08.01.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Apr 2018 08:01:04 -0700 (PDT) From: Taehee Yoo To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH nf-next] netfilter: ebtables: remove EBT_MATCH and EBT_NOMATCH Date: Mon, 9 Apr 2018 00:00:57 +0900 Message-Id: <20180408150057.25106-1-ap420073@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org EBT_MATCH and EBT_NOMATCH are used to change return value. match functions(ebt_xxx.c) return false when received frame is not matched and returns true when received frame is matched. but, EBT_MATCH_ITERATE understands oppositely. so, to change return value, EBT_MATCH and EBT_NOMATCH are used. but, we can use operation '!' simply. Signed-off-by: Taehee Yoo --- include/linux/netfilter_bridge/ebtables.h | 4 ---- net/bridge/netfilter/ebtables.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h index 0773b5a..c6935be 100644 --- a/include/linux/netfilter_bridge/ebtables.h +++ b/include/linux/netfilter_bridge/ebtables.h @@ -17,10 +17,6 @@ #include #include -/* return values for match() functions */ -#define EBT_MATCH 0 -#define EBT_NOMATCH 1 - struct ebt_match { struct list_head list; const char name[EBT_FUNCTION_MAXNAMELEN]; diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 9a26d2b..b176d67 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -101,7 +101,7 @@ ebt_do_match(struct ebt_entry_match *m, const struct sk_buff *skb, { par->match = m->u.match; par->matchinfo = m->data; - return m->u.match->match(skb, par) ? EBT_MATCH : EBT_NOMATCH; + return !m->u.match->match(skb, par); } static inline int