diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /net/ipv4/ip_masq_mod.c | |
parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'net/ipv4/ip_masq_mod.c')
-rw-r--r-- | net/ipv4/ip_masq_mod.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv4/ip_masq_mod.c b/net/ipv4/ip_masq_mod.c index 797f9112f..2265161f3 100644 --- a/net/ipv4/ip_masq_mod.c +++ b/net/ipv4/ip_masq_mod.c @@ -12,6 +12,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * + * Changes: + * Cyrus Durgin: fixed kerneld stuff for kmod. */ #include <linux/config.h> @@ -21,8 +23,8 @@ #include <linux/errno.h> #include <net/ip_masq.h> #include <net/ip_masq_mod.h> -#ifdef CONFIG_KERNELD -#include <linux/kerneld.h> +#ifdef CONFIG_KMOD +#include <linux/kmod.h> #endif EXPORT_SYMBOL(register_ip_masq_mod); @@ -290,7 +292,7 @@ struct ip_masq_mod * ip_masq_mod_getbyname(const char *mmod_name) int ip_masq_mod_ctl(int optname, struct ip_fw_masqctl *mctl, int optlen) { struct ip_masq_mod * mmod; -#ifdef CONFIG_KERNELD +#ifdef CONFIG_KMOD char kmod_name[IP_MASQ_MOD_NMAX+8]; #endif /* tappo */ @@ -299,7 +301,7 @@ int ip_masq_mod_ctl(int optname, struct ip_fw_masqctl *mctl, int optlen) mmod = ip_masq_mod_getbyname(mctl->u.mod.name); if (mmod) return mmod->mmod_ctl(optname, mctl, optlen); -#ifdef CONFIG_KERNELD +#ifdef CONFIG_KMOD sprintf(kmod_name,"ip_masq_%s", mctl->u.mod.name); IP_MASQ_DEBUG(1, "About to request \"%s\" module\n", kmod_name); |