diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-28 19:08:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-28 19:08:13 -0400 |
| commit | 38ff4fa49bef77e86b21d95d9ce341a098f02839 (patch) | |
| tree | 9c1b370a8d81410296719325a9b8264200e1af72 /net/netfilter/nf_conntrack_h323_main.c | |
| parent | 1afa67f5e70b4733d5b237df61e6d639af6283bb (diff) | |
netfilter: replace uses of NIP6_FMT with %p6
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_h323_main.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index c1504f71cdf..29e49b1c80b 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c | |||
| @@ -850,10 +850,8 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct, | |||
| 850 | get_h225_addr(ct, *data, &setup->destCallSignalAddress, | 850 | get_h225_addr(ct, *data, &setup->destCallSignalAddress, |
| 851 | &addr, &port) && | 851 | &addr, &port) && |
| 852 | memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) { | 852 | memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) { |
| 853 | pr_debug("nf_ct_q931: set destCallSignalAddress " | 853 | pr_debug("nf_ct_q931: set destCallSignalAddress %p6:%hu->%p6:%hu\n", |
| 854 | NIP6_FMT ":%hu->" NIP6_FMT ":%hu\n", | 854 | &addr, ntohs(port), &ct->tuplehash[!dir].tuple.src.u3, |
| 855 | NIP6(*(struct in6_addr *)&addr), ntohs(port), | ||
| 856 | NIP6(*(struct in6_addr *)&ct->tuplehash[!dir].tuple.src.u3), | ||
| 857 | ntohs(ct->tuplehash[!dir].tuple.src.u.tcp.port)); | 855 | ntohs(ct->tuplehash[!dir].tuple.src.u.tcp.port)); |
| 858 | ret = set_h225_addr(skb, data, dataoff, | 856 | ret = set_h225_addr(skb, data, dataoff, |
| 859 | &setup->destCallSignalAddress, | 857 | &setup->destCallSignalAddress, |
| @@ -868,10 +866,8 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct, | |||
| 868 | get_h225_addr(ct, *data, &setup->sourceCallSignalAddress, | 866 | get_h225_addr(ct, *data, &setup->sourceCallSignalAddress, |
| 869 | &addr, &port) && | 867 | &addr, &port) && |
| 870 | memcmp(&addr, &ct->tuplehash[!dir].tuple.dst.u3, sizeof(addr))) { | 868 | memcmp(&addr, &ct->tuplehash[!dir].tuple.dst.u3, sizeof(addr))) { |
| 871 | pr_debug("nf_ct_q931: set sourceCallSignalAddress " | 869 | pr_debug("nf_ct_q931: set sourceCallSignalAddress %p6:%hu->%p6:%hu\n", |
| 872 | NIP6_FMT ":%hu->" NIP6_FMT ":%hu\n", | 870 | &addr, ntohs(port), &ct->tuplehash[!dir].tuple.dst.u3, |
| 873 | NIP6(*(struct in6_addr *)&addr), ntohs(port), | ||
| 874 | NIP6(*(struct in6_addr *)&ct->tuplehash[!dir].tuple.dst.u3), | ||
| 875 | ntohs(ct->tuplehash[!dir].tuple.dst.u.tcp.port)); | 871 | ntohs(ct->tuplehash[!dir].tuple.dst.u.tcp.port)); |
| 876 | ret = set_h225_addr(skb, data, dataoff, | 872 | ret = set_h225_addr(skb, data, dataoff, |
| 877 | &setup->sourceCallSignalAddress, | 873 | &setup->sourceCallSignalAddress, |