Merge branch 'x86/core' into x86/xsave

[pandora-kernel.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 8c50eb4..5bcc452 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -128,10 +128,8 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)
 
 static void llc_ui_sk_init(struct socket *sock, struct sock *sk)
 {
+       sock_graft(sk, sock);
        sk->sk_type     = sock->type;
-       sk->sk_sleep    = &sock->wait;
-       sk->sk_socket   = sock;
-       sock->sk        = sk;
        sock->ops       = &llc_ui_ops;
 }
 
@@ -188,7 +186,7 @@ static int llc_ui_release(struct socket *sock)
        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);
@@ -298,7 +296,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
        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;
@@ -435,7 +433,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) {
-               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;
@@ -607,7 +605,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
        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))
@@ -622,7 +620,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
                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;
@@ -643,7 +641,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--;
-       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);
@@ -836,7 +834,7 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
        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) {
@@ -894,7 +892,7 @@ out:
                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;