diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/ipv4/ipvs | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_proto_udp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_sync.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c index 12dc0d640b6..620e40ff79a 100644 --- a/net/ipv4/ipvs/ip_vs_proto_tcp.c +++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c | |||
@@ -550,7 +550,7 @@ tcp_app_conn_bind(struct ip_vs_conn *cp) | |||
550 | 550 | ||
551 | IP_VS_DBG(9, "%s: Binding conn %u.%u.%u.%u:%u->" | 551 | IP_VS_DBG(9, "%s: Binding conn %u.%u.%u.%u:%u->" |
552 | "%u.%u.%u.%u:%u to app %s on port %u\n", | 552 | "%u.%u.%u.%u:%u to app %s on port %u\n", |
553 | __FUNCTION__, | 553 | __func__, |
554 | NIPQUAD(cp->caddr), ntohs(cp->cport), | 554 | NIPQUAD(cp->caddr), ntohs(cp->cport), |
555 | NIPQUAD(cp->vaddr), ntohs(cp->vport), | 555 | NIPQUAD(cp->vaddr), ntohs(cp->vport), |
556 | inc->name, ntohs(inc->port)); | 556 | inc->name, ntohs(inc->port)); |
diff --git a/net/ipv4/ipvs/ip_vs_proto_udp.c b/net/ipv4/ipvs/ip_vs_proto_udp.c index 1fa7b330b9a..1caa2908373 100644 --- a/net/ipv4/ipvs/ip_vs_proto_udp.c +++ b/net/ipv4/ipvs/ip_vs_proto_udp.c | |||
@@ -344,7 +344,7 @@ static int udp_app_conn_bind(struct ip_vs_conn *cp) | |||
344 | 344 | ||
345 | IP_VS_DBG(9, "%s: Binding conn %u.%u.%u.%u:%u->" | 345 | IP_VS_DBG(9, "%s: Binding conn %u.%u.%u.%u:%u->" |
346 | "%u.%u.%u.%u:%u to app %s on port %u\n", | 346 | "%u.%u.%u.%u:%u to app %s on port %u\n", |
347 | __FUNCTION__, | 347 | __func__, |
348 | NIPQUAD(cp->caddr), ntohs(cp->cport), | 348 | NIPQUAD(cp->caddr), ntohs(cp->cport), |
349 | NIPQUAD(cp->vaddr), ntohs(cp->vport), | 349 | NIPQUAD(cp->vaddr), ntohs(cp->vport), |
350 | inc->name, ntohs(inc->port)); | 350 | inc->name, ntohs(inc->port)); |
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 948378d0a75..69c56663cc9 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c | |||
@@ -916,7 +916,7 @@ int start_sync_thread(int state, char *mcast_ifn, __u8 syncid) | |||
916 | if (!tinfo) | 916 | if (!tinfo) |
917 | return -ENOMEM; | 917 | return -ENOMEM; |
918 | 918 | ||
919 | IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, task_pid_nr(current)); | 919 | IP_VS_DBG(7, "%s: pid %d\n", __func__, task_pid_nr(current)); |
920 | IP_VS_DBG(7, "Each ip_vs_sync_conn entry need %Zd bytes\n", | 920 | IP_VS_DBG(7, "Each ip_vs_sync_conn entry need %Zd bytes\n", |
921 | sizeof(struct ip_vs_sync_conn)); | 921 | sizeof(struct ip_vs_sync_conn)); |
922 | 922 | ||
@@ -956,7 +956,7 @@ int stop_sync_thread(int state) | |||
956 | (state == IP_VS_STATE_BACKUP && !sync_backup_pid)) | 956 | (state == IP_VS_STATE_BACKUP && !sync_backup_pid)) |
957 | return -ESRCH; | 957 | return -ESRCH; |
958 | 958 | ||
959 | IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, task_pid_nr(current)); | 959 | IP_VS_DBG(7, "%s: pid %d\n", __func__, task_pid_nr(current)); |
960 | IP_VS_INFO("stopping sync thread %d ...\n", | 960 | IP_VS_INFO("stopping sync thread %d ...\n", |
961 | (state == IP_VS_STATE_MASTER) ? | 961 | (state == IP_VS_STATE_MASTER) ? |
962 | sync_master_pid : sync_backup_pid); | 962 | sync_master_pid : sync_backup_pid); |