projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: replace remaining __FUNCTION__ occurrences
[GitHub/moto-9609/android_kernel_motorola_exynos9610.git]
/
net
/
llc
/
af_llc.c
diff --git
a/net/llc/af_llc.c
b/net/llc/af_llc.c
index 46cf962f7f8889f049a3b0406f9f5f3b6c31034c..f93b576185823321ce38897ce450a7990f263fbb 100644
(file)
--- a/
net/llc/af_llc.c
+++ b/
net/llc/af_llc.c
@@
-185,7
+185,7
@@
static int llc_ui_release(struct socket *sock)
sock_hold(sk);
lock_sock(sk);
llc = llc_sk(sk);
sock_hold(sk);
lock_sock(sk);
llc = llc_sk(sk);
- dprintk("%s: closing local(%02X) remote(%02X)\n", __
FUNCTION
__,
+ dprintk("%s: closing local(%02X) remote(%02X)\n", __
func
__,
llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk))
llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk))
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)
struct llc_sap *sap;
int rc = -EINVAL;
struct llc_sap *sap;
int rc = -EINVAL;
- dprintk("%s: binding %02X\n", __
FUNCTION
__, addr->sllc_sap);
+ dprintk("%s: binding %02X\n", __
func
__, addr->sllc_sap);
if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))
goto out;
rc = -EAFNOSUPPORT;
if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))
goto out;
rc = -EAFNOSUPPORT;
@@
-432,7
+432,7
@@
static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
rc = llc_establish_connection(sk, llc->dev->dev_addr,
addr->sllc_mac, addr->sllc_sap);
if (rc) {
rc = llc_establish_connection(sk, llc->dev->dev_addr,
addr->sllc_mac, addr->sllc_sap);
if (rc) {
- dprintk("%s: llc_ui_send_conn failed :-(\n", __
FUNCTION
__);
+ dprintk("%s: llc_ui_send_conn failed :-(\n", __
func
__);
sock->state = SS_UNCONNECTED;
sk->sk_state = TCP_CLOSE;
goto out;
sock->state = SS_UNCONNECTED;
sk->sk_state = TCP_CLOSE;
goto out;
@@
-604,7
+604,7
@@
static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
struct sk_buff *skb;
int rc = -EOPNOTSUPP;
struct sk_buff *skb;
int rc = -EOPNOTSUPP;
- dprintk("%s: accepting on %02X\n", __
FUNCTION
__,
+ dprintk("%s: accepting on %02X\n", __
func
__,
llc_sk(sk)->laddr.lsap);
lock_sock(sk);
if (unlikely(sk->sk_type != SOCK_STREAM))
llc_sk(sk)->laddr.lsap);
lock_sock(sk);
if (unlikely(sk->sk_type != SOCK_STREAM))
@@
-619,7
+619,7
@@
static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
if (rc)
goto out;
}
if (rc)
goto out;
}
- dprintk("%s: got a new connection on %02X\n", __
FUNCTION
__,
+ dprintk("%s: got a new connection on %02X\n", __
func
__,
llc_sk(sk)->laddr.lsap);
skb = skb_dequeue(&sk->sk_receive_queue);
rc = -EINVAL;
llc_sk(sk)->laddr.lsap);
skb = skb_dequeue(&sk->sk_receive_queue);
rc = -EINVAL;
@@
-640,7
+640,7
@@
static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
/* put original socket back into a clean listen state. */
sk->sk_state = TCP_LISTEN;
sk->sk_ack_backlog--;
/* put original socket back into a clean listen state. */
sk->sk_state = TCP_LISTEN;
sk->sk_ack_backlog--;
- dprintk("%s: ok success on %02X, client on %02X\n", __
FUNCTION
__,
+ dprintk("%s: ok success on %02X, client on %02X\n", __
func
__,
llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);
frees:
kfree_skb(skb);
llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);
frees:
kfree_skb(skb);
@@
-833,7
+833,7
@@
static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
size_t size = 0;
int rc = -EINVAL, copied = 0, hdrlen;
size_t size = 0;
int rc = -EINVAL, copied = 0, hdrlen;
- dprintk("%s: sending from %02X to %02X\n", __
FUNCTION
__,
+ dprintk("%s: sending from %02X to %02X\n", __
func
__,
llc->laddr.lsap, llc->daddr.lsap);
lock_sock(sk);
if (addr) {
llc->laddr.lsap, llc->daddr.lsap);
lock_sock(sk);
if (addr) {
@@
-891,7
+891,7
@@
out:
kfree_skb(skb);
release:
dprintk("%s: failed sending from %02X to %02X: %d\n",
kfree_skb(skb);
release:
dprintk("%s: failed sending from %02X to %02X: %d\n",
- __
FUNCTION
__, llc->laddr.lsap, llc->daddr.lsap, rc);
+ __
func
__, llc->laddr.lsap, llc->daddr.lsap, rc);
}
release_sock(sk);
return rc ? : copied;
}
release_sock(sk);
return rc ? : copied;