Skip to contentSkip to conversation

ip_conntrack_helper_h323.c: make get_h245_addr() static

RFC PATCH In review Adrian Bunk 3 participants 4 messages Mar 24, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ip_conntrack_helper_h323.c: make get_h245_addr() static

This patch makes a needlessly global function static.

---

 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(-)
net/ipv4/netfilter/ip_nat_helper_h323.c renamed from net/ipv4/netfilter/ip_nat_helper_h323.c.old +0 -2
@@ -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,
net/ipv4/netfilter/ip_conntrack_helper_h323.c renamed from net/ipv4/netfilter/ip_conntrack_helper_h323.c.old +2 -3
@@ -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);
#1 lore raw

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

----- Original Message ----- From: "Adrian Bunk" <[email protected]>
To: "Jing Min Zhao" <[email protected]>
Cc: <[email protected]>; <[email protected]>; <[email protected]>
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

Quoted 51 lines

This patch makes a needlessly global function static.

---

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
net/ipv4/netfilter/ip_nat_helper_h323.c renamed from net/ipv4/netfilter/ip_nat_helper_h323.c.old +0 -2
@@ -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
net/ipv4/netfilter/ip_conntrack_helper_h323.c renamed from net/ipv4/netfilter/ip_conntrack_helper_h323.c.old +2 -3
@@ -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);
#2 lore raw

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

Quoted 2 lines · Jing Min Zhao

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

The point is:
There have been many occasions where people have said "I will need this soon" in many different places in the kernel, and one year later it was still unused.

If it will be needed at some point in the future, reverting my patch will be trivial.

Quoted 3 lines

Thanks

Jing Min Zhao

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
maintainer
#3 lore raw

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

From: Adrian Bunk <[email protected]>
Date: Fri, 24 Mar 2006 08:55:11 +0100

Quoted 7 lines

The point is:
There have been many occasions where people have said "I will need this soon" in many different places in the kernel, and one year later it was still unused.

If it will be needed at some point in the future, reverting my patch will be trivial.

Agreed.