浏览代码

[IPVS]: Rename tcp_{init,exit}() --> ip_vs_tcp_{init,exit}()

Conflicts with global namespace functions with the
same name.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 20 年之前
父节点
当前提交
ba602a8161
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      net/ipv4/ipvs/ip_vs_proto_tcp.c

+ 4 - 4
net/ipv4/ipvs/ip_vs_proto_tcp.c

@@ -604,14 +604,14 @@ void ip_vs_tcp_conn_listen(struct ip_vs_conn *cp)
 }
 }
 
 
 
 
-static void tcp_init(struct ip_vs_protocol *pp)
+static void ip_vs_tcp_init(struct ip_vs_protocol *pp)
 {
 {
 	IP_VS_INIT_HASH_TABLE(tcp_apps);
 	IP_VS_INIT_HASH_TABLE(tcp_apps);
 	pp->timeout_table = tcp_timeouts;
 	pp->timeout_table = tcp_timeouts;
 }
 }
 
 
 
 
-static void tcp_exit(struct ip_vs_protocol *pp)
+static void ip_vs_tcp_exit(struct ip_vs_protocol *pp)
 {
 {
 }
 }
 
 
@@ -621,8 +621,8 @@ struct ip_vs_protocol ip_vs_protocol_tcp = {
 	.protocol =		IPPROTO_TCP,
 	.protocol =		IPPROTO_TCP,
 	.dont_defrag =		0,
 	.dont_defrag =		0,
 	.appcnt =		ATOMIC_INIT(0),
 	.appcnt =		ATOMIC_INIT(0),
-	.init =			tcp_init,
-	.exit =			tcp_exit,
+	.init =			ip_vs_tcp_init,
+	.exit =			ip_vs_tcp_exit,
 	.register_app =		tcp_register_app,
 	.register_app =		tcp_register_app,
 	.unregister_app =	tcp_unregister_app,
 	.unregister_app =	tcp_unregister_app,
 	.conn_schedule =	tcp_conn_schedule,
 	.conn_schedule =	tcp_conn_schedule,