aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/af_llc.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 23:47:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 23:47:47 -0500
commit0dc47877a3de00ceadea0005189656ae8dc52669 (patch)
tree7440a87385fe318cb42f0ae161be195f5e967d82 /net/llc/af_llc.c
parent6387c4bed539539b05fa773cf2ff26529dc3074c (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/llc/af_llc.c')
-rw-r--r--net/llc/af_llc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 46cf962f7f88..f93b57618582 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -185,7 +185,7 @@ static int llc_ui_release(struct socket *sock)
185 sock_hold(sk); 185 sock_hold(sk);
186 lock_sock(sk); 186 lock_sock(sk);
187 llc = llc_sk(sk); 187 llc = llc_sk(sk);
188 dprintk("%s: closing local(%02X) remote(%02X)\n", __FUNCTION__, 188 dprintk("%s: closing local(%02X) remote(%02X)\n", __func__,
189 llc->laddr.lsap, llc->daddr.lsap); 189 llc->laddr.lsap, llc->daddr.lsap);
190 if (!llc_send_disc(sk)) 190 if (!llc_send_disc(sk))
191 llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo); 191 llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
@@ -295,7 +295,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
295 struct llc_sap *sap; 295 struct llc_sap *sap;
296 int rc = -EINVAL; 296 int rc = -EINVAL;
297 297
298 dprintk("%s: binding %02X\n", __FUNCTION__, addr->sllc_sap); 298 dprintk("%s: binding %02X\n", __func__, addr->sllc_sap);
299 if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))) 299 if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))
300 goto out; 300 goto out;
301 rc = -EAFNOSUPPORT; 301 rc = -EAFNOSUPPORT;
@@ -432,7 +432,7 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
432 rc = llc_establish_connection(sk, llc->dev->dev_addr, 432 rc = llc_establish_connection(sk, llc->dev->dev_addr,
433 addr->sllc_mac, addr->sllc_sap); 433 addr->sllc_mac, addr->sllc_sap);
434 if (rc) { 434 if (rc) {
435 dprintk("%s: llc_ui_send_conn failed :-(\n", __FUNCTION__); 435 dprintk("%s: llc_ui_send_conn failed :-(\n", __func__);
436 sock->state = SS_UNCONNECTED; 436 sock->state = SS_UNCONNECTED;
437 sk->sk_state = TCP_CLOSE; 437 sk->sk_state = TCP_CLOSE;
438 goto out; 438 goto out;
@@ -604,7 +604,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
604 struct sk_buff *skb; 604 struct sk_buff *skb;
605 int rc = -EOPNOTSUPP; 605 int rc = -EOPNOTSUPP;
606 606
607 dprintk("%s: accepting on %02X\n", __FUNCTION__, 607 dprintk("%s: accepting on %02X\n", __func__,
608 llc_sk(sk)->laddr.lsap); 608 llc_sk(sk)->laddr.lsap);
609 lock_sock(sk); 609 lock_sock(sk);
610 if (unlikely(sk->sk_type != SOCK_STREAM)) 610 if (unlikely(sk->sk_type != SOCK_STREAM))
@@ -619,7 +619,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
619 if (rc) 619 if (rc)
620 goto out; 620 goto out;
621 } 621 }
622 dprintk("%s: got a new connection on %02X\n", __FUNCTION__, 622 dprintk("%s: got a new connection on %02X\n", __func__,
623 llc_sk(sk)->laddr.lsap); 623 llc_sk(sk)->laddr.lsap);
624 skb = skb_dequeue(&sk->sk_receive_queue); 624 skb = skb_dequeue(&sk->sk_receive_queue);
625 rc = -EINVAL; 625 rc = -EINVAL;
@@ -640,7 +640,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
640 /* put original socket back into a clean listen state. */ 640 /* put original socket back into a clean listen state. */
641 sk->sk_state = TCP_LISTEN; 641 sk->sk_state = TCP_LISTEN;
642 sk->sk_ack_backlog--; 642 sk->sk_ack_backlog--;
643 dprintk("%s: ok success on %02X, client on %02X\n", __FUNCTION__, 643 dprintk("%s: ok success on %02X, client on %02X\n", __func__,
644 llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap); 644 llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);
645frees: 645frees:
646 kfree_skb(skb); 646 kfree_skb(skb);
@@ -833,7 +833,7 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
833 size_t size = 0; 833 size_t size = 0;
834 int rc = -EINVAL, copied = 0, hdrlen; 834 int rc = -EINVAL, copied = 0, hdrlen;
835 835
836 dprintk("%s: sending from %02X to %02X\n", __FUNCTION__, 836 dprintk("%s: sending from %02X to %02X\n", __func__,
837 llc->laddr.lsap, llc->daddr.lsap); 837 llc->laddr.lsap, llc->daddr.lsap);
838 lock_sock(sk); 838 lock_sock(sk);
839 if (addr) { 839 if (addr) {
@@ -891,7 +891,7 @@ out:
891 kfree_skb(skb); 891 kfree_skb(skb);
892release: 892release:
893 dprintk("%s: failed sending from %02X to %02X: %d\n", 893 dprintk("%s: failed sending from %02X to %02X: %d\n",
894 __FUNCTION__, llc->laddr.lsap, llc->daddr.lsap, rc); 894 __func__, llc->laddr.lsap, llc->daddr.lsap, rc);
895 } 895 }
896 release_sock(sk); 896 release_sock(sk);
897 return rc ? : copied; 897 return rc ? : copied;