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/sctp/socket.c | |
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/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 939892691a26..1316694d0a21 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -525,7 +525,7 @@ static int sctp_send_asconf_add_ip(struct sock *sk, | |||
525 | ep = sp->ep; | 525 | ep = sp->ep; |
526 | 526 | ||
527 | SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n", | 527 | SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n", |
528 | __FUNCTION__, sk, addrs, addrcnt); | 528 | __func__, sk, addrs, addrcnt); |
529 | 529 | ||
530 | list_for_each(pos, &ep->asocs) { | 530 | list_for_each(pos, &ep->asocs) { |
531 | asoc = list_entry(pos, struct sctp_association, asocs); | 531 | asoc = list_entry(pos, struct sctp_association, asocs); |
@@ -711,7 +711,7 @@ static int sctp_send_asconf_del_ip(struct sock *sk, | |||
711 | ep = sp->ep; | 711 | ep = sp->ep; |
712 | 712 | ||
713 | SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n", | 713 | SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n", |
714 | __FUNCTION__, sk, addrs, addrcnt); | 714 | __func__, sk, addrs, addrcnt); |
715 | 715 | ||
716 | list_for_each(pos, &ep->asocs) { | 716 | list_for_each(pos, &ep->asocs) { |
717 | asoc = list_entry(pos, struct sctp_association, asocs); | 717 | asoc = list_entry(pos, struct sctp_association, asocs); |
@@ -1197,7 +1197,7 @@ SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk, | |||
1197 | struct sockaddr *kaddrs; | 1197 | struct sockaddr *kaddrs; |
1198 | 1198 | ||
1199 | SCTP_DEBUG_PRINTK("%s - sk %p addrs %p addrs_size %d\n", | 1199 | SCTP_DEBUG_PRINTK("%s - sk %p addrs %p addrs_size %d\n", |
1200 | __FUNCTION__, sk, addrs, addrs_size); | 1200 | __func__, sk, addrs, addrs_size); |
1201 | 1201 | ||
1202 | if (unlikely(addrs_size <= 0)) | 1202 | if (unlikely(addrs_size <= 0)) |
1203 | return -EINVAL; | 1203 | return -EINVAL; |
@@ -3280,7 +3280,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *addr, | |||
3280 | sctp_lock_sock(sk); | 3280 | sctp_lock_sock(sk); |
3281 | 3281 | ||
3282 | SCTP_DEBUG_PRINTK("%s - sk: %p, sockaddr: %p, addr_len: %d\n", | 3282 | SCTP_DEBUG_PRINTK("%s - sk: %p, sockaddr: %p, addr_len: %d\n", |
3283 | __FUNCTION__, sk, addr, addr_len); | 3283 | __func__, sk, addr, addr_len); |
3284 | 3284 | ||
3285 | /* Validate addr_len before calling common connect/connectx routine. */ | 3285 | /* Validate addr_len before calling common connect/connectx routine. */ |
3286 | af = sctp_get_af_specific(addr->sa_family); | 3286 | af = sctp_get_af_specific(addr->sa_family); |
@@ -3801,7 +3801,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval | |||
3801 | goto out; | 3801 | goto out; |
3802 | } | 3802 | } |
3803 | 3803 | ||
3804 | SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p\n", __FUNCTION__, sk, asoc); | 3804 | SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p\n", __func__, sk, asoc); |
3805 | 3805 | ||
3806 | retval = sctp_do_peeloff(asoc, &newsock); | 3806 | retval = sctp_do_peeloff(asoc, &newsock); |
3807 | if (retval < 0) | 3807 | if (retval < 0) |
@@ -3815,7 +3815,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval | |||
3815 | } | 3815 | } |
3816 | 3816 | ||
3817 | SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p newsk: %p sd: %d\n", | 3817 | SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p newsk: %p sd: %d\n", |
3818 | __FUNCTION__, sk, asoc, newsock->sk, retval); | 3818 | __func__, sk, asoc, newsock->sk, retval); |
3819 | 3819 | ||
3820 | /* Return the fd mapped to the new socket. */ | 3820 | /* Return the fd mapped to the new socket. */ |
3821 | peeloff.sd = retval; | 3821 | peeloff.sd = retval; |
@@ -6186,7 +6186,7 @@ static int sctp_wait_for_connect(struct sctp_association *asoc, long *timeo_p) | |||
6186 | long current_timeo = *timeo_p; | 6186 | long current_timeo = *timeo_p; |
6187 | DEFINE_WAIT(wait); | 6187 | DEFINE_WAIT(wait); |
6188 | 6188 | ||
6189 | SCTP_DEBUG_PRINTK("%s: asoc=%p, timeo=%ld\n", __FUNCTION__, asoc, | 6189 | SCTP_DEBUG_PRINTK("%s: asoc=%p, timeo=%ld\n", __func__, asoc, |
6190 | (long)(*timeo_p)); | 6190 | (long)(*timeo_p)); |
6191 | 6191 | ||
6192 | /* Increment the association's refcnt. */ | 6192 | /* Increment the association's refcnt. */ |