diff options
| author | Jan Engelhardt | 2007-12-18 07:43:50 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-28 23:59:07 +0100 |
| commit | 643a2c15a407faf08101a20e1a3461160711899d (patch) | |
| tree | ee1634c4961162f3ae938fb892b64083af838ba3 /include/linux/netfilter/nf_conntrack_h323.h | |
| parent | [NETFILTER]: x_tables: use %u format specifiers (diff) | |
| download | kernel-qcow2-linux-643a2c15a407faf08101a20e1a3461160711899d.tar.gz kernel-qcow2-linux-643a2c15a407faf08101a20e1a3461160711899d.tar.xz kernel-qcow2-linux-643a2c15a407faf08101a20e1a3461160711899d.zip | |
[NETFILTER]: Introduce nf_inet_address
A few netfilter modules provide their own union of IPv4 and IPv6
address storage. Will unify that in this patch series.
(1/4): Rename union nf_conntrack_address to union nf_inet_addr and
move it to x_tables.h.
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netfilter/nf_conntrack_h323.h')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_h323.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netfilter/nf_conntrack_h323.h b/include/linux/netfilter/nf_conntrack_h323.h index aabd24ac7631..26f9226ea72b 100644 --- a/include/linux/netfilter/nf_conntrack_h323.h +++ b/include/linux/netfilter/nf_conntrack_h323.h @@ -31,7 +31,7 @@ struct nf_conn; extern int get_h225_addr(struct nf_conn *ct, unsigned char *data, TransportAddress *taddr, - union nf_conntrack_address *addr, __be16 *port); + union nf_inet_addr *addr, __be16 *port); extern void nf_conntrack_h245_expect(struct nf_conn *new, struct nf_conntrack_expect *this); extern void nf_conntrack_q931_expect(struct nf_conn *new, @@ -39,12 +39,12 @@ extern void nf_conntrack_q931_expect(struct nf_conn *new, extern int (*set_h245_addr_hook) (struct sk_buff *skb, unsigned char **data, int dataoff, H245_TransportAddress *taddr, - union nf_conntrack_address *addr, + union nf_inet_addr *addr, __be16 port); extern int (*set_h225_addr_hook) (struct sk_buff *skb, unsigned char **data, int dataoff, TransportAddress *taddr, - union nf_conntrack_address *addr, + union nf_inet_addr *addr, __be16 port); extern int (*set_sig_addr_hook) (struct sk_buff *skb, struct nf_conn *ct, |