diff options
| author | Patrick McHardy <kaber@coreworks.de> | 2004-11-15 23:31:12 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@coreworks.de> | 2004-11-15 23:31:12 +0100 |
| commit | fbc32bd6c488d676efc7602898242b0d3e644d82 (patch) | |
| tree | 576f5656401ef0ee7a606be6ee6d76cb1080cb5e /include/linux | |
| parent | 31dd505499bdb977eac1eaea0ad898e42aa8b258 (diff) | |
| parent | b803d5f51dbd2da941e6f37301a23be67c129601 (diff) | |
Merge coreworks.de:/home/kaber/src/nf/nf-2.6-icmp
into coreworks.de:/home/kaber/src/nf/nf-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter.h | 2 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_nat_protocol.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index ced66929126c..b0ee19e302de 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -173,6 +173,7 @@ extern void nf_reinject(struct sk_buff *skb, unsigned int verdict); extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *); +extern void nf_ct_attach(struct sk_buff *, struct sk_buff *); #ifdef CONFIG_NETFILTER_DEBUG extern void nf_dump_skb(int pf, struct sk_buff *skb); @@ -183,6 +184,7 @@ extern void nf_invalidate_cache(int pf); #else /* !CONFIG_NETFILTER */ #define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb) +static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} #endif /*CONFIG_NETFILTER*/ #endif /*__KERNEL__*/ diff --git a/include/linux/netfilter_ipv4/ip_nat_protocol.h b/include/linux/netfilter_ipv4/ip_nat_protocol.h index e81795806ee3..f343239cd4ea 100644 --- a/include/linux/netfilter_ipv4/ip_nat_protocol.h +++ b/include/linux/netfilter_ipv4/ip_nat_protocol.h @@ -18,7 +18,7 @@ struct ip_nat_protocol /* Do a packet translation according to the ip_nat_proto_manip * and manip type. Return true if succeeded. */ int (*manip_pkt)(struct sk_buff **pskb, - unsigned int hdroff, + unsigned int iphdroff, const struct ip_conntrack_manip *manip, enum ip_nat_manip_type maniptype); |