From patchwork Thu Oct 21 15:19:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 68638 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 92C77B7105 for ; Fri, 22 Oct 2010 02:21:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753776Ab0JUPUx (ORCPT ); Thu, 21 Oct 2010 11:20:53 -0400 Received: from stinky.trash.net ([213.144.137.162]:59997 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533Ab0JUPUR (ORCPT ); Thu, 21 Oct 2010 11:20:17 -0400 Received: from x2.localnet. (localhost [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id 0B7BCB2C5F; Thu, 21 Oct 2010 17:20:17 +0200 (MEST) From: kaber@trash.net To: davem@davemloft.net Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 68/72] netfilter: ebtables: remove unused definitions Date: Thu, 21 Oct 2010 17:19:55 +0200 Message-Id: <1287674399-31455-69-git-send-email-kaber@trash.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1287674399-31455-1-git-send-email-kaber@trash.net> References: <1287674399-31455-1-git-send-email-kaber@trash.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jan Engelhardt Userspace does not make use of the inner definitions, so we can remove these from the header now. v2.6.27-rc8-947-g66bff35 removed the last uses of these structs in the kernel. Signed-off-by: Jan Engelhardt --- include/linux/netfilter_bridge/ebtables.h | 52 ----------------------------- 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h index 1c6f0c5..cbbb883 100644 --- a/include/linux/netfilter_bridge/ebtables.h +++ b/include/linux/netfilter_bridge/ebtables.h @@ -199,58 +199,6 @@ struct ebt_entry { #define EBT_MATCH 0 #define EBT_NOMATCH 1 -struct ebt_match { - struct list_head list; - const char name[EBT_FUNCTION_MAXNAMELEN]; - bool (*match)(const struct sk_buff *skb, const struct net_device *in, - const struct net_device *out, const struct xt_match *match, - const void *matchinfo, int offset, unsigned int protoff, - bool *hotdrop); - bool (*checkentry)(const char *table, const void *entry, - const struct xt_match *match, void *matchinfo, - unsigned int hook_mask); - void (*destroy)(const struct xt_match *match, void *matchinfo); - unsigned int matchsize; - u_int8_t revision; - u_int8_t family; - struct module *me; -}; - -struct ebt_watcher { - struct list_head list; - const char name[EBT_FUNCTION_MAXNAMELEN]; - unsigned int (*target)(struct sk_buff *skb, - const struct net_device *in, const struct net_device *out, - unsigned int hook_num, const struct xt_target *target, - const void *targinfo); - bool (*checkentry)(const char *table, const void *entry, - const struct xt_target *target, void *targinfo, - unsigned int hook_mask); - void (*destroy)(const struct xt_target *target, void *targinfo); - unsigned int targetsize; - u_int8_t revision; - u_int8_t family; - struct module *me; -}; - -struct ebt_target { - struct list_head list; - const char name[EBT_FUNCTION_MAXNAMELEN]; - /* returns one of the standard EBT_* verdicts */ - unsigned int (*target)(struct sk_buff *skb, - const struct net_device *in, const struct net_device *out, - unsigned int hook_num, const struct xt_target *target, - const void *targinfo); - bool (*checkentry)(const char *table, const void *entry, - const struct xt_target *target, void *targinfo, - unsigned int hook_mask); - void (*destroy)(const struct xt_target *target, void *targinfo); - unsigned int targetsize; - u_int8_t revision; - u_int8_t family; - struct module *me; -}; - /* used for jumping from and into user defined chains (udc) */ struct ebt_chainstack { struct ebt_entries *chaininfo; /* pointer to chain data */