diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-25 04:58:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-25 04:58:35 -0700 |
| commit | 4a14ac720b4a056248c1b4c5b730b6129cbf08ce (patch) | |
| tree | 38f5cb6a904d1dce46a490a5f21bb1bc6c1fbf9b /include/linux | |
| parent | 4b6243ca36127091c17dba9dff98ba46f619f506 (diff) | |
| parent | a443da372815fa5e05b64067f82c8fbd977d09a7 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/interrupt.h | 18 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack.h | 12 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_nat_helper.h | 3 |
3 files changed, 13 insertions, 20 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 503c72da8c47..da2eaeb18118 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -213,24 +213,6 @@ extern void tasklet_kill(struct tasklet_struct *t); extern void tasklet_init(struct tasklet_struct *t, void (*func)(unsigned long), unsigned long data); -#ifdef CONFIG_SMP - -#define SMP_TIMER_NAME(name) name##__thr - -#define SMP_TIMER_DEFINE(name, task) \ -DECLARE_TASKLET(task, name##__thr, 0); \ -static void name (unsigned long dummy) \ -{ \ - tasklet_schedule(&(task)); \ -} - -#else /* CONFIG_SMP */ - -#define SMP_TIMER_NAME(name) name -#define SMP_TIMER_DEFINE(name, task) - -#endif /* CONFIG_SMP */ - /* * Autoprobing for irqs: * diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index 1dc2e0d5ce5e..44daac8cde2a 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -7,6 +7,7 @@ #include <linux/config.h> #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> #include <linux/bitops.h> +#include <linux/compiler.h> #include <asm/atomic.h> enum ip_conntrack_info @@ -266,5 +267,16 @@ static inline int is_confirmed(struct ip_conntrack *ct) } extern unsigned int ip_conntrack_htable_size; + +/* eg. PROVIDES_CONNTRACK(ftp); */ +#define PROVIDES_CONNTRACK(name) \ + int needs_ip_conntrack_##name; \ + EXPORT_SYMBOL(needs_ip_conntrack_##name) + +/*. eg. NEEDS_CONNTRACK(ftp); */ +#define NEEDS_CONNTRACK(name) \ + extern int needs_ip_conntrack_##name; \ + static int *need_ip_conntrack_##name __attribute_used__ = &needs_ip_conntrack_##name + #endif /* __KERNEL__ */ #endif /* _IP_CONNTRACK_H */ diff --git a/include/linux/netfilter_ipv4/ip_nat_helper.h b/include/linux/netfilter_ipv4/ip_nat_helper.h index 633a9c37170d..185a24a6a047 100644 --- a/include/linux/netfilter_ipv4/ip_nat_helper.h +++ b/include/linux/netfilter_ipv4/ip_nat_helper.h @@ -3,14 +3,13 @@ /* NAT protocol helper routines. */ #include <linux/netfilter_ipv4/ip_conntrack.h> +#include <linux/module.h> struct sk_buff; /* Flags */ /* NAT helper must be called on every packet (for TCP) */ #define IP_NAT_HELPER_F_ALWAYS 0x01 -/* Standalone NAT helper, without a conntrack part */ -#define IP_NAT_HELPER_F_STANDALONE 0x02 struct ip_nat_helper { |