diff options
Diffstat (limited to 'net/llc/af_llc.c')
-rw-r--r-- | net/llc/af_llc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 190bb3e05188..7d9fa38b6a7d 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -67,7 +67,7 @@ static inline u16 llc_ui_next_link_no(int sap) | |||
67 | static inline __be16 llc_proto_type(u16 arphrd) | 67 | static inline __be16 llc_proto_type(u16 arphrd) |
68 | { | 68 | { |
69 | return arphrd == ARPHRD_IEEE802_TR ? | 69 | return arphrd == ARPHRD_IEEE802_TR ? |
70 | htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); | 70 | htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); |
71 | } | 71 | } |
72 | 72 | ||
73 | /** | 73 | /** |
@@ -114,7 +114,7 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock) | |||
114 | struct llc_sock* llc = llc_sk(sk); | 114 | struct llc_sock* llc = llc_sk(sk); |
115 | int rc = 0; | 115 | int rc = 0; |
116 | 116 | ||
117 | if (unlikely(llc_data_accept_state(llc->state) || | 117 | if (unlikely(llc_data_accept_state(llc->state) || |
118 | llc->remote_busy_flag || | 118 | llc->remote_busy_flag || |
119 | llc->p_flag)) { | 119 | llc->p_flag)) { |
120 | long timeout = sock_sndtimeo(sk, noblock); | 120 | long timeout = sock_sndtimeo(sk, noblock); |
@@ -602,7 +602,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags) | |||
602 | int rc = -EOPNOTSUPP; | 602 | int rc = -EOPNOTSUPP; |
603 | 603 | ||
604 | dprintk("%s: accepting on %02X\n", __FUNCTION__, | 604 | dprintk("%s: accepting on %02X\n", __FUNCTION__, |
605 | llc_sk(sk)->laddr.lsap); | 605 | llc_sk(sk)->laddr.lsap); |
606 | lock_sock(sk); | 606 | lock_sock(sk); |
607 | if (unlikely(sk->sk_type != SOCK_STREAM)) | 607 | if (unlikely(sk->sk_type != SOCK_STREAM)) |
608 | goto out; | 608 | goto out; |
@@ -617,7 +617,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags) | |||
617 | goto out; | 617 | goto out; |
618 | } | 618 | } |
619 | dprintk("%s: got a new connection on %02X\n", __FUNCTION__, | 619 | dprintk("%s: got a new connection on %02X\n", __FUNCTION__, |
620 | llc_sk(sk)->laddr.lsap); | 620 | llc_sk(sk)->laddr.lsap); |
621 | skb = skb_dequeue(&sk->sk_receive_queue); | 621 | skb = skb_dequeue(&sk->sk_receive_queue); |
622 | rc = -EINVAL; | 622 | rc = -EINVAL; |
623 | if (!skb->sk) | 623 | if (!skb->sk) |
@@ -682,7 +682,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
682 | if (flags & MSG_PEEK) { | 682 | if (flags & MSG_PEEK) { |
683 | peek_seq = llc->copied_seq; | 683 | peek_seq = llc->copied_seq; |
684 | seq = &peek_seq; | 684 | seq = &peek_seq; |
685 | } | 685 | } |
686 | 686 | ||
687 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); | 687 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); |
688 | copied = 0; | 688 | copied = 0; |
@@ -860,7 +860,7 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
860 | goto release; | 860 | goto release; |
861 | skb->dev = llc->dev; | 861 | skb->dev = llc->dev; |
862 | skb->protocol = llc_proto_type(addr->sllc_arphrd); | 862 | skb->protocol = llc_proto_type(addr->sllc_arphrd); |
863 | skb_reserve(skb, hdrlen); | 863 | skb_reserve(skb, hdrlen); |
864 | rc = memcpy_fromiovec(skb_put(skb, copied), msg->msg_iov, copied); | 864 | rc = memcpy_fromiovec(skb_put(skb, copied), msg->msg_iov, copied); |
865 | if (rc) | 865 | if (rc) |
866 | goto out; | 866 | goto out; |
@@ -1116,11 +1116,11 @@ static const struct proto_ops llc_ui_ops = { | |||
1116 | }; | 1116 | }; |
1117 | 1117 | ||
1118 | static char llc_proc_err_msg[] __initdata = | 1118 | static char llc_proc_err_msg[] __initdata = |
1119 | KERN_CRIT "LLC: Unable to register the proc_fs entries\n"; | 1119 | KERN_CRIT "LLC: Unable to register the proc_fs entries\n"; |
1120 | static char llc_sysctl_err_msg[] __initdata = | 1120 | static char llc_sysctl_err_msg[] __initdata = |
1121 | KERN_CRIT "LLC: Unable to register the sysctl entries\n"; | 1121 | KERN_CRIT "LLC: Unable to register the sysctl entries\n"; |
1122 | static char llc_sock_err_msg[] __initdata = | 1122 | static char llc_sock_err_msg[] __initdata = |
1123 | KERN_CRIT "LLC: Unable to register the network family\n"; | 1123 | KERN_CRIT "LLC: Unable to register the network family\n"; |
1124 | 1124 | ||
1125 | static int __init llc2_init(void) | 1125 | static int __init llc2_init(void) |
1126 | { | 1126 | { |