From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Netfilter Development Mailinglist <netfilter-devel@lists.netfilter.org>
Cc: Patrick McHardy <kaber@trash.net>
Subject: [PATCH 2/7] remove nfnl_[lock|unlock] functions
Date: Mon, 12 Feb 2007 23:46:03 +0100 [thread overview]
Message-ID: <45D0EE2B.5070004@netfilter.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
Use nfnl_shlock instead
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris
[-- Attachment #2: 02.patch --]
[-- Type: text/plain, Size: 1766 bytes --]
[PATCH] remove nfnl_[lock|unlock] functions
Use nfnl_shlock instead
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Index: net-2.6.git/net/netfilter/nfnetlink.c
===================================================================
--- net-2.6.git.orig/net/netfilter/nfnetlink.c 2006-12-26 04:32:54.000000000 +0100
+++ net-2.6.git/net/netfilter/nfnetlink.c 2007-01-19 19:34:48.000000000 +0100
@@ -46,34 +46,24 @@ static struct sock *nfnl = NULL;
static struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];
DECLARE_MUTEX(nfnl_sem);
-void nfnl_lock(void)
-{
- nfnl_shlock();
-}
-
-void nfnl_unlock(void)
-{
- nfnl_shunlock();
-}
-
int nfnetlink_subsys_register(struct nfnetlink_subsystem *n)
{
- nfnl_lock();
+ nfnl_shlock();
if (subsys_table[n->subsys_id]) {
- nfnl_unlock();
+ nfnl_shunlock();
return -EBUSY;
}
subsys_table[n->subsys_id] = n;
- nfnl_unlock();
+ nfnl_shunlock();
return 0;
}
int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n)
{
- nfnl_lock();
+ nfnl_shlock();
subsys_table[n->subsys_id] = NULL;
- nfnl_unlock();
+ nfnl_shunlock();
return 0;
}
Index: net-2.6.git/include/linux/netfilter/nfnetlink.h
===================================================================
--- net-2.6.git.orig/include/linux/netfilter/nfnetlink.h 2007-01-19 19:34:59.000000000 +0100
+++ net-2.6.git/include/linux/netfilter/nfnetlink.h 2007-01-19 19:35:43.000000000 +0100
@@ -139,9 +139,6 @@ extern struct semaphore nfnl_sem;
nfnl->sk_data_ready(nfnl, 0); \
} while(0)
-extern void nfnl_lock(void);
-extern void nfnl_unlock(void);
-
extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
next reply other threads:[~2007-02-12 22:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-12 22:46 Pablo Neira Ayuso [this message]
2007-02-13 10:53 ` [PATCH 2/7] remove nfnl_[lock|unlock] functions Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45D0EE2B.5070004@netfilter.org \
--to=pablo@netfilter.org \
--cc=kaber@trash.net \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.