5 files changed, 29 insertions, 29 deletions

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 8c50eb430c19..97101dcde4c0 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -188,7 +188,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 +298,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 +435,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 +607,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 +622,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 +643,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 +836,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 +894,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;
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 71a00225bdb3..019c780512e8 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -1430,7 +1430,7 @@ static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb)
 {
         if (llc_sk(sk)->state == LLC_CONN_OUT_OF_SVC) {
                 printk(KERN_WARNING "%s: timer called on closed connection\n",
-                       __FUNCTION__);
+                       __func__);
                 kfree_skb(skb);
         } else {
                 if (!sock_owned_by_user(sk))
diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c
index c5deda246614..523fdd1cf781 100644
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -228,7 +228,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
                  llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
         if (!rc)
                 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
-                        __FUNCTION__, llc_sk(sk)->state, ns, vr);
+                        __func__, llc_sk(sk)->state, ns, vr);
         return rc;
 }
 
@@ -306,7 +306,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
                  llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
         if (!rc)
                 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
-                        __FUNCTION__, llc_sk(sk)->state, ns, vr);
+                        __func__, llc_sk(sk)->state, ns, vr);
         return rc;
 }
 
@@ -511,7 +511,7 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
             (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
             nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
                 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
-                        __FUNCTION__, llc_sk(sk)->state, vs, nr);
+                        __func__, llc_sk(sk)->state, vs, nr);
                 rc = 0;
         }
         return rc;
@@ -530,7 +530,7 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
             nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
                 rc = 0;
                 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
-                        __FUNCTION__, llc_sk(sk)->state, vs, nr);
+                        __func__, llc_sk(sk)->state, vs, nr);
         }
         return rc;
 }
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 441bc18f996d..5c6d89c6d51d 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -73,7 +73,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
          */
         rc = llc_conn_service(skb->sk, skb);
         if (unlikely(rc != 0)) {
-                printk(KERN_ERR "%s: llc_conn_service failed\n", __FUNCTION__);
+                printk(KERN_ERR "%s: llc_conn_service failed\n", __func__);
                 goto out_kfree_skb;
         }
 
@@ -99,7 +99,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                          * shouldn't happen
                          */
                         printk(KERN_ERR "%s: sock_queue_rcv_skb failed!\n",
-                               __FUNCTION__);
+                               __func__);
                         kfree_skb(skb);
                 }
                 break;
@@ -132,13 +132,13 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                  * FIXME:
                  * RESET is not being notified to upper layers for now
                  */
-                printk(KERN_INFO "%s: received a reset ind!\n", __FUNCTION__);
+                printk(KERN_INFO "%s: received a reset ind!\n", __func__);
                 kfree_skb(skb);
                 break;
         default:
                 if (ev->ind_prim) {
                         printk(KERN_INFO "%s: received unknown %d prim!\n",
-                                __FUNCTION__, ev->ind_prim);
+                                __func__, ev->ind_prim);
                         kfree_skb(skb);
                 }
                 /* No indication */
@@ -179,12 +179,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                  * FIXME:
                  * RESET is not being notified to upper layers for now
                  */
-                printk(KERN_INFO "%s: received a reset conf!\n", __FUNCTION__);
+                printk(KERN_INFO "%s: received a reset conf!\n", __func__);
                 break;
         default:
                 if (ev->cfm_prim) {
                         printk(KERN_INFO "%s: received unknown %d prim!\n",
-                                        __FUNCTION__, ev->cfm_prim);
+                                        __func__, ev->cfm_prim);
                         break;
                 }
                 goto out_skb_put; /* No confirmation */
@@ -700,7 +700,7 @@ static struct sock *llc_create_incoming_sock(struct sock *sk,
                                              struct llc_addr *saddr,
                                              struct llc_addr *daddr)
 {
-        struct sock *newsk = llc_sk_alloc(sk->sk_net, sk->sk_family, GFP_ATOMIC,
+        struct sock *newsk = llc_sk_alloc(sock_net(sk), sk->sk_family, GFP_ATOMIC,
                                           sk->sk_prot);
         struct llc_sock *newllc, *llc = llc_sk(sk);
 
@@ -759,7 +759,7 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
         if (!sock_owned_by_user(sk))
                 llc_conn_rcv(sk, skb);
         else {
-                dprintk("%s: adding to backlog...\n", __FUNCTION__);
+                dprintk("%s: adding to backlog...\n", __func__);
                 llc_set_backlog_type(skb, LLC_PACKET);
                 sk_add_backlog(sk, skb);
         }
@@ -807,7 +807,7 @@ static int llc_backlog_rcv(struct sock *sk, struct sk_buff *skb)
                 else
                         goto out_kfree_skb;
         } else {
-                printk(KERN_ERR "%s: invalid skb in backlog\n", __FUNCTION__);
+                printk(KERN_ERR "%s: invalid skb in backlog\n", __func__);
                 goto out_kfree_skb;
         }
 out:
@@ -874,7 +874,7 @@ struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct pr
 #ifdef LLC_REFCNT_DEBUG
         atomic_inc(&llc_sock_nr);
         printk(KERN_DEBUG "LLC socket %p created in %s, now we have %d alive\n", sk,
-                __FUNCTION__, atomic_read(&llc_sock_nr));
+                __func__, atomic_read(&llc_sock_nr));
 #endif
 out:
         return sk;
@@ -894,7 +894,7 @@ void llc_sk_free(struct sock *sk)
         /* Stop all (possibly) running timers */
         llc_conn_ac_stop_all_timers(sk, NULL);
 #ifdef DEBUG_LLC_CONN_ALLOC
-        printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __FUNCTION__,
+        printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __func__,
                 skb_queue_len(&llc->pdu_unack_q),
                 skb_queue_len(&sk->sk_write_queue));
 #endif
@@ -904,13 +904,13 @@ void llc_sk_free(struct sock *sk)
 #ifdef LLC_REFCNT_DEBUG
         if (atomic_read(&sk->sk_refcnt) != 1) {
                 printk(KERN_DEBUG "Destruction of LLC sock %p delayed in %s, cnt=%d\n",
-                        sk, __FUNCTION__, atomic_read(&sk->sk_refcnt));
+                        sk, __func__, atomic_read(&sk->sk_refcnt));
                 printk(KERN_DEBUG "%d LLC sockets are still alive\n",
                         atomic_read(&llc_sock_nr));
         } else {
                 atomic_dec(&llc_sock_nr);
                 printk(KERN_DEBUG "LLC socket %p released in %s, %d are still alive\n", sk,
-                        __FUNCTION__, atomic_read(&llc_sock_nr));
+                        __func__, atomic_read(&llc_sock_nr));
         }
 #endif
         sock_put(sk);
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index bfd2567dd365..1c45f172991e 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -150,7 +150,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
         int (*rcv)(struct sk_buff *, struct net_device *,
                    struct packet_type *, struct net_device *);
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         /*
@@ -158,7 +158,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
          * receives, do not try to analyse it.
          */
         if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) {
-                dprintk("%s: PACKET_OTHERHOST\n", __FUNCTION__);
+                dprintk("%s: PACKET_OTHERHOST\n", __func__);
                 goto drop;
         }
         skb = skb_share_check(skb, GFP_ATOMIC);
@@ -171,7 +171,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
                goto handle_station;
         sap = llc_sap_find(pdu->dsap);
         if (unlikely(!sap)) {/* unknown SAP */
-                dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__,
+                dprintk("%s: llc_sap_find(%02X) failed!\n", __func__,
                         pdu->dsap);
                 goto drop;
         }