From 2a3bdb63d0bae5cd88562a85c3151091ff69c25f Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 22 Mar 2006 13:57:25 -0800 Subject: [PATCH] --- yaml --- r: 22873 b: refs/heads/master c: 6a534ee35cfd02f60e99d301b9ac446ea11a9cfd h: refs/heads/master i: 22871: 34581532ff90f57268066ab0436148b8eae47177 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ee6b03ddc82..3fa2d885a6f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e30a014e311e627b91489ff5ec1b54496d308af +refs/heads/master: 6a534ee35cfd02f60e99d301b9ac446ea11a9cfd diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c index 20da6730b860..daeb1395faa4 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c @@ -639,8 +639,8 @@ void ip_conntrack_h245_expect(struct ip_conntrack *new, } /****************************************************************************/ -static int get_h225_addr(unsigned char *data, TransportAddress * addr, - u_int32_t * ip, u_int16_t * port) +int get_h225_addr(unsigned char *data, TransportAddress * addr, + u_int32_t * ip, u_int16_t * port) { unsigned char *p;