Re: 2.6 patch] ip_conntrack_helper_h323.c: make get_h245_addr()static

From: Jing Min Zhao
Date: Thu Mar 23 2006 - 21:34:34 EST



----- Original Message ----- From: "Adrian Bunk" <bunk@xxxxxxxxx>
To: "Jing Min Zhao" <zhaojignmin@xxxxxxxxxxx>
Cc: <netdev@xxxxxxxxxxxxxxx>; <netfilter-devel@xxxxxxxxxxxxxxxxxxx>; <linux-kernel@xxxxxxxxxxxxxxx>
Sent: Thursday, March 23, 2006 7:09 PM
Subject: [RFC: 2.6 patch] ip_conntrack_helper_h323.c: make get_h245_addr()static

I'd like to keep it global. In the future we may need it.

Thanks

Jing Min Zhao

This patch makes a needlessly global function static.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

net/ipv4/netfilter/ip_conntrack_helper_h323.c | 5 ++---
net/ipv4/netfilter/ip_nat_helper_h323.c | 2 --
2 files changed, 2 insertions(+), 5 deletions(-)

--- linux-2.6.16-mm1-full/net/ipv4/netfilter/ip_nat_helper_h323.c.old 2006-03-23 23:13:59.000000000 +0100
+++ linux-2.6.16-mm1-full/net/ipv4/netfilter/ip_nat_helper_h323.c 2006-03-23 23:14:05.000000000 +0100
@@ -49,8 +49,6 @@
#define DEBUGP(format, args...)
#endif

-extern int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
- u_int32_t * ip, u_int16_t * port);
extern int get_h225_addr(unsigned char *data, TransportAddress * addr,
u_int32_t * ip, u_int16_t * port);
extern void ip_conntrack_h245_expect(struct ip_conntrack *new,
--- linux-2.6.16-mm1-full/net/ipv4/netfilter/ip_conntrack_helper_h323.c.old 2006-03-23 23:14:21.000000000 +0100
+++ linux-2.6.16-mm1-full/net/ipv4/netfilter/ip_conntrack_helper_h323.c 2006-03-23 23:14:35.000000000 +0100
@@ -222,8 +222,8 @@
}

/****************************************************************************/
-int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
- u_int32_t * ip, u_int16_t * port)
+static int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
+ u_int32_t * ip, u_int16_t * port)
{
unsigned char *p;

@@ -1713,7 +1713,6 @@
module_init(init);
module_exit(fini);

-EXPORT_SYMBOL(get_h245_addr);
EXPORT_SYMBOL(get_h225_addr);
EXPORT_SYMBOL(ip_conntrack_h245_expect);
EXPORT_SYMBOL(ip_conntrack_q931_expect);



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/