From 84374abae766eb609c9160a73d18c63e034a1c47 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Thu, 26 Dec 2002 10:50:46 +0000 Subject: [arnd_at_bergmann-dalldorf.de] make check_chainloops static function --- kernel/linux/net/bridge/netfilter/ebt_log.c | 2 +- kernel/linux/net/bridge/netfilter/ebtables.c | 5 +++-- kernel/linux2.5/net/bridge/netfilter/ebtables.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'kernel') diff --git a/kernel/linux/net/bridge/netfilter/ebt_log.c b/kernel/linux/net/bridge/netfilter/ebt_log.c index 86591d2..8648493 100644 --- a/kernel/linux/net/bridge/netfilter/ebt_log.c +++ b/kernel/linux/net/bridge/netfilter/ebt_log.c @@ -78,7 +78,7 @@ static void ebt_log(const struct sk_buff *skb, const struct net_device *in, spin_unlock_bh(&ebt_log_lock); } -struct ebt_watcher log = +static struct ebt_watcher log = { {NULL, NULL}, EBT_LOG_WATCHER, ebt_log, ebt_log_check, NULL, THIS_MODULE diff --git a/kernel/linux/net/bridge/netfilter/ebtables.c b/kernel/linux/net/bridge/netfilter/ebtables.c index 04afde7..9877321 100644 --- a/kernel/linux/net/bridge/netfilter/ebtables.c +++ b/kernel/linux/net/bridge/netfilter/ebtables.c @@ -664,8 +664,9 @@ cleanup_matches: // checks for loops and sets the hook mask for udc // the hook mask for udc tells us from which base chains the udc can be // accessed. This mask is a parameter to the check() functions of the extensions -int check_chainloops(struct ebt_entries *chain, struct ebt_cl_stack *cl_s, - unsigned int udc_cnt, unsigned int hooknr, char *base) +static int check_chainloops(struct ebt_entries *chain, + struct ebt_cl_stack *cl_s, unsigned int udc_cnt, + unsigned int hooknr, char *base) { int i, chain_nr = -1, pos = 0, nentries = chain->nentries, verdict; struct ebt_entry *e = (struct ebt_entry *)chain->data; diff --git a/kernel/linux2.5/net/bridge/netfilter/ebtables.c b/kernel/linux2.5/net/bridge/netfilter/ebtables.c index 25ab7a2..2244913 100644 --- a/kernel/linux2.5/net/bridge/netfilter/ebtables.c +++ b/kernel/linux2.5/net/bridge/netfilter/ebtables.c @@ -664,8 +664,9 @@ cleanup_matches: // checks for loops and sets the hook mask for udc // the hook mask for udc tells us from which base chains the udc can be // accessed. This mask is a parameter to the check() functions of the extensions -int check_chainloops(struct ebt_entries *chain, struct ebt_cl_stack *cl_s, - unsigned int udc_cnt, unsigned int hooknr, char *base) +static int check_chainloops(struct ebt_entries *chain, + struct ebt_cl_stack *cl_s, unsigned int udc_cnt, + unsigned int hooknr, char *base) { int i, chain_nr = -1, pos = 0, nentries = chain->nentries, verdict; struct ebt_entry *e = (struct ebt_entry *)chain->data; -- cgit v1.2.3