[netfilter-cvslog] r3349 - trunk/nfsim/core

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-13 13:09:17 +0100 (Mon, 13 Dec 2004)
New Revision: 3349

Modified:
   trunk/nfsim/core/core.h
Log:
Set ->owner automatically for 2.4 code which doesn't.


Modified: trunk/nfsim/core/core.h
===================================================================
--- trunk/nfsim/core/core.h	2004-12-13 12:08:45 UTC (rev 3348)
+++ trunk/nfsim/core/core.h	2004-12-13 12:09:17 UTC (rev 3349)
@@ -141,22 +141,16 @@
 };
 
 /* Function to register/unregister hook points. */
-
-int nf_register_hook(struct nf_hook_ops *reg);
+#define nf_register_hook(reg) __nf_register_hook(reg, THIS_MODULE)
+int __nf_register_hook(struct nf_hook_ops *reg, struct module *this);
 void nf_unregister_hook(struct nf_hook_ops *reg);
 
 /* Functions to register get/setsockopt ranges (non-inclusive).  You
    need to check permissions yourself! */
-int __nf_register_sockopt(struct nf_sockopt_ops *reg);
+#define nf_register_sockopt(reg) __nf_register_sockopt(reg, THIS_MODULE)
+int __nf_register_sockopt(struct nf_sockopt_ops *reg, struct module *this);
 void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
 
-static inline int nf_register_sockopt(struct nf_sockopt_ops *reg)
-{
-	reg->owner = THIS_MODULE;
-	return __nf_register_sockopt(reg);
-}
-
-
 int nf_setsockopt(struct sock *sk, int pf, int val, char *opt, int len);
 int nf_getsockopt(struct sock *sk, int pf, int val, char *opt, int *len);