aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/af_llc.c16
-rw-r--r--net/llc/llc_c_ac.c2
-rw-r--r--net/llc/llc_c_ev.c8
-rw-r--r--net/llc/llc_conn.c24
-rw-r--r--net/llc/llc_input.c4
5 files changed, 27 insertions, 27 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;
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 860140caa6e0..f728ffe288aa 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -1427,7 +1427,7 @@ static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb)
1427{ 1427{
1428 if (llc_sk(sk)->state == LLC_CONN_OUT_OF_SVC) { 1428 if (llc_sk(sk)->state == LLC_CONN_OUT_OF_SVC) {
1429 printk(KERN_WARNING "%s: timer called on closed connection\n", 1429 printk(KERN_WARNING "%s: timer called on closed connection\n",
1430 __FUNCTION__); 1430 __func__);
1431 kfree_skb(skb); 1431 kfree_skb(skb);
1432 } else { 1432 } else {
1433 if (!sock_owned_by_user(sk)) 1433 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,
228 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1; 228 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
229 if (!rc) 229 if (!rc)
230 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n", 230 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
231 __FUNCTION__, llc_sk(sk)->state, ns, vr); 231 __func__, llc_sk(sk)->state, ns, vr);
232 return rc; 232 return rc;
233} 233}
234 234
@@ -306,7 +306,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
306 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1; 306 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
307 if (!rc) 307 if (!rc)
308 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n", 308 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
309 __FUNCTION__, llc_sk(sk)->state, ns, vr); 309 __func__, llc_sk(sk)->state, ns, vr);
310 return rc; 310 return rc;
311} 311}
312 312
@@ -511,7 +511,7 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
511 (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) && 511 (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
512 nr != vs && llc_util_nr_inside_tx_window(sk, nr)) { 512 nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
513 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n", 513 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
514 __FUNCTION__, llc_sk(sk)->state, vs, nr); 514 __func__, llc_sk(sk)->state, vs, nr);
515 rc = 0; 515 rc = 0;
516 } 516 }
517 return rc; 517 return rc;
@@ -530,7 +530,7 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
530 nr != vs && llc_util_nr_inside_tx_window(sk, nr)) { 530 nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
531 rc = 0; 531 rc = 0;
532 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n", 532 dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
533 __FUNCTION__, llc_sk(sk)->state, vs, nr); 533 __func__, llc_sk(sk)->state, vs, nr);
534 } 534 }
535 return rc; 535 return rc;
536} 536}
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 441bc18f996d..5ebfd93ff5e7 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)
73 */ 73 */
74 rc = llc_conn_service(skb->sk, skb); 74 rc = llc_conn_service(skb->sk, skb);
75 if (unlikely(rc != 0)) { 75 if (unlikely(rc != 0)) {
76 printk(KERN_ERR "%s: llc_conn_service failed\n", __FUNCTION__); 76 printk(KERN_ERR "%s: llc_conn_service failed\n", __func__);
77 goto out_kfree_skb; 77 goto out_kfree_skb;
78 } 78 }
79 79
@@ -99,7 +99,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
99 * shouldn't happen 99 * shouldn't happen
100 */ 100 */
101 printk(KERN_ERR "%s: sock_queue_rcv_skb failed!\n", 101 printk(KERN_ERR "%s: sock_queue_rcv_skb failed!\n",
102 __FUNCTION__); 102 __func__);
103 kfree_skb(skb); 103 kfree_skb(skb);
104 } 104 }
105 break; 105 break;
@@ -132,13 +132,13 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
132 * FIXME: 132 * FIXME:
133 * RESET is not being notified to upper layers for now 133 * RESET is not being notified to upper layers for now
134 */ 134 */
135 printk(KERN_INFO "%s: received a reset ind!\n", __FUNCTION__); 135 printk(KERN_INFO "%s: received a reset ind!\n", __func__);
136 kfree_skb(skb); 136 kfree_skb(skb);
137 break; 137 break;
138 default: 138 default:
139 if (ev->ind_prim) { 139 if (ev->ind_prim) {
140 printk(KERN_INFO "%s: received unknown %d prim!\n", 140 printk(KERN_INFO "%s: received unknown %d prim!\n",
141 __FUNCTION__, ev->ind_prim); 141 __func__, ev->ind_prim);
142 kfree_skb(skb); 142 kfree_skb(skb);
143 } 143 }
144 /* No indication */ 144 /* No indication */
@@ -179,12 +179,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
179 * FIXME: 179 * FIXME:
180 * RESET is not being notified to upper layers for now 180 * RESET is not being notified to upper layers for now
181 */ 181 */
182 printk(KERN_INFO "%s: received a reset conf!\n", __FUNCTION__); 182 printk(KERN_INFO "%s: received a reset conf!\n", __func__);
183 break; 183 break;
184 default: 184 default:
185 if (ev->cfm_prim) { 185 if (ev->cfm_prim) {
186 printk(KERN_INFO "%s: received unknown %d prim!\n", 186 printk(KERN_INFO "%s: received unknown %d prim!\n",
187 __FUNCTION__, ev->cfm_prim); 187 __func__, ev->cfm_prim);
188 break; 188 break;
189 } 189 }
190 goto out_skb_put; /* No confirmation */ 190 goto out_skb_put; /* No confirmation */
@@ -759,7 +759,7 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
759 if (!sock_owned_by_user(sk)) 759 if (!sock_owned_by_user(sk))
760 llc_conn_rcv(sk, skb); 760 llc_conn_rcv(sk, skb);
761 else { 761 else {
762 dprintk("%s: adding to backlog...\n", __FUNCTION__); 762 dprintk("%s: adding to backlog...\n", __func__);
763 llc_set_backlog_type(skb, LLC_PACKET); 763 llc_set_backlog_type(skb, LLC_PACKET);
764 sk_add_backlog(sk, skb); 764 sk_add_backlog(sk, skb);
765 } 765 }
@@ -807,7 +807,7 @@ static int llc_backlog_rcv(struct sock *sk, struct sk_buff *skb)
807 else 807 else
808 goto out_kfree_skb; 808 goto out_kfree_skb;
809 } else { 809 } else {
810 printk(KERN_ERR "%s: invalid skb in backlog\n", __FUNCTION__); 810 printk(KERN_ERR "%s: invalid skb in backlog\n", __func__);
811 goto out_kfree_skb; 811 goto out_kfree_skb;
812 } 812 }
813out: 813out:
@@ -874,7 +874,7 @@ struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct pr
874#ifdef LLC_REFCNT_DEBUG 874#ifdef LLC_REFCNT_DEBUG
875 atomic_inc(&llc_sock_nr); 875 atomic_inc(&llc_sock_nr);
876 printk(KERN_DEBUG "LLC socket %p created in %s, now we have %d alive\n", sk, 876 printk(KERN_DEBUG "LLC socket %p created in %s, now we have %d alive\n", sk,
877 __FUNCTION__, atomic_read(&llc_sock_nr)); 877 __func__, atomic_read(&llc_sock_nr));
878#endif 878#endif
879out: 879out:
880 return sk; 880 return sk;
@@ -894,7 +894,7 @@ void llc_sk_free(struct sock *sk)
894 /* Stop all (possibly) running timers */ 894 /* Stop all (possibly) running timers */
895 llc_conn_ac_stop_all_timers(sk, NULL); 895 llc_conn_ac_stop_all_timers(sk, NULL);
896#ifdef DEBUG_LLC_CONN_ALLOC 896#ifdef DEBUG_LLC_CONN_ALLOC
897 printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __FUNCTION__, 897 printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __func__,
898 skb_queue_len(&llc->pdu_unack_q), 898 skb_queue_len(&llc->pdu_unack_q),
899 skb_queue_len(&sk->sk_write_queue)); 899 skb_queue_len(&sk->sk_write_queue));
900#endif 900#endif
@@ -904,13 +904,13 @@ void llc_sk_free(struct sock *sk)
904#ifdef LLC_REFCNT_DEBUG 904#ifdef LLC_REFCNT_DEBUG
905 if (atomic_read(&sk->sk_refcnt) != 1) { 905 if (atomic_read(&sk->sk_refcnt) != 1) {
906 printk(KERN_DEBUG "Destruction of LLC sock %p delayed in %s, cnt=%d\n", 906 printk(KERN_DEBUG "Destruction of LLC sock %p delayed in %s, cnt=%d\n",
907 sk, __FUNCTION__, atomic_read(&sk->sk_refcnt)); 907 sk, __func__, atomic_read(&sk->sk_refcnt));
908 printk(KERN_DEBUG "%d LLC sockets are still alive\n", 908 printk(KERN_DEBUG "%d LLC sockets are still alive\n",
909 atomic_read(&llc_sock_nr)); 909 atomic_read(&llc_sock_nr));
910 } else { 910 } else {
911 atomic_dec(&llc_sock_nr); 911 atomic_dec(&llc_sock_nr);
912 printk(KERN_DEBUG "LLC socket %p released in %s, %d are still alive\n", sk, 912 printk(KERN_DEBUG "LLC socket %p released in %s, %d are still alive\n", sk,
913 __FUNCTION__, atomic_read(&llc_sock_nr)); 913 __func__, atomic_read(&llc_sock_nr));
914 } 914 }
915#endif 915#endif
916 sock_put(sk); 916 sock_put(sk);
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index c40c9b2a345a..b9143d2a04e1 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -154,7 +154,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
154 * receives, do not try to analyse it. 154 * receives, do not try to analyse it.
155 */ 155 */
156 if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) { 156 if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) {
157 dprintk("%s: PACKET_OTHERHOST\n", __FUNCTION__); 157 dprintk("%s: PACKET_OTHERHOST\n", __func__);
158 goto drop; 158 goto drop;
159 } 159 }
160 skb = skb_share_check(skb, GFP_ATOMIC); 160 skb = skb_share_check(skb, GFP_ATOMIC);
@@ -167,7 +167,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
167 goto handle_station; 167 goto handle_station;
168 sap = llc_sap_find(pdu->dsap); 168 sap = llc_sap_find(pdu->dsap);
169 if (unlikely(!sap)) {/* unknown SAP */ 169 if (unlikely(!sap)) {/* unknown SAP */
170 dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__, 170 dprintk("%s: llc_sap_find(%02X) failed!\n", __func__,
171 pdu->dsap); 171 pdu->dsap);
172 goto drop; 172 goto drop;
173 } 173 }