Skip to content

L
linux
Commit aee01ebf authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o net/llc: simple cleanups 

. align switch with its cases
. fit some lines in 80 columns
parent d1f880ab
Show whitespace changes
Inline Side-by-side
Showing with 224 additions and 218 deletions
net/llc/af_llc.c
View file @ aee01ebf
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* connections. * connections.
* *
* Copyright (c) 2001 by Jay Schulist <jschlst@samba.org> * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
* 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2002-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
...@@ -623,7 +623,8 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -623,7 +623,8 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
struct sk_buff *skb; struct sk_buff *skb;
int rc = -EOPNOTSUPP; int rc = -EOPNOTSUPP;
dprintk("%s: accepting on %02X\n", __FUNCTION__, llc_sk(sk)->addr.sllc_ssap); dprintk("%s: accepting on %02X\n", __FUNCTION__,
llc_sk(sk)->addr.sllc_ssap);
lock_sock(sk); lock_sock(sk);
if (sk->type != SOCK_STREAM) if (sk->type != SOCK_STREAM)
goto out; goto out;
...@@ -634,7 +635,8 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -634,7 +635,8 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
rc = llc_ui_wait_for_data(sk, sk->rcvtimeo); rc = llc_ui_wait_for_data(sk, sk->rcvtimeo);
if (rc) if (rc)
goto out; goto out;
dprintk("%s: got a new connection on %02X\n", __FUNCTION__, llc_sk(sk)->addr.sllc_ssap); dprintk("%s: got a new connection on %02X\n", __FUNCTION__,
llc_sk(sk)->addr.sllc_ssap);
skb = skb_dequeue(&sk->receive_queue); skb = skb_dequeue(&sk->receive_queue);
rc = -EINVAL; rc = -EINVAL;
if (!skb->sk) if (!skb->sk)
...@@ -692,8 +694,9 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -692,8 +694,9 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
timeout = sock_rcvtimeo(sk, noblock); timeout = sock_rcvtimeo(sk, noblock);
rc = llc_ui_wait_for_data(sk, timeout); rc = llc_ui_wait_for_data(sk, timeout);
if (rc) { if (rc) {
dprintk("%s: llc_ui_wait_for_data failed recv in %02X from %02X\n", dprintk("%s: llc_ui_wait_for_data failed recv "
__FUNCTION__, llc_sk(sk)->laddr.lsap, llc_sk(sk)->daddr.lsap); "in %02X from %02X\n", __FUNCTION__,
llc_sk(sk)->laddr.lsap, llc_sk(sk)->daddr.lsap);
goto out; goto out;
} }
skb = skb_dequeue(&sk->receive_queue); skb = skb_dequeue(&sk->receive_queue);
...@@ -742,7 +745,8 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -742,7 +745,8 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
struct sk_buff *skb; struct sk_buff *skb;
int rc = -EINVAL, size = 0, copied = 0, hdrlen; int rc = -EINVAL, size = 0, copied = 0, hdrlen;
dprintk("%s: sending from %02X to %02X\n", __FUNCTION__, llc->laddr.lsap, llc->daddr.lsap); dprintk("%s: sending from %02X to %02X\n", __FUNCTION__,
llc->laddr.lsap, llc->daddr.lsap);
lock_sock(sk); lock_sock(sk);
if (addr) { if (addr) {
if (msg->msg_namelen < sizeof(*addr)) if (msg->msg_namelen < sizeof(*addr))
...@@ -1038,7 +1042,8 @@ static struct proto_ops llc_ui_ops = { ...@@ -1038,7 +1042,8 @@ static struct proto_ops llc_ui_ops = {
}; };
static char llc_ui_banner[] __initdata = static char llc_ui_banner[] __initdata =
KERN_INFO "NET4.0 IEEE 802.2 BSD sockets, Jay Schulist, 2001, Arnaldo C. Melo, 2002\n"; KERN_INFO "NET4.0 IEEE 802.2 BSD sockets, Jay Schulist, 2001, "
"Arnaldo C. Melo, 2002-2003\n";
int __init llc_ui_init(void) int __init llc_ui_init(void)
{ {
......
net/llc/llc_actn.c
View file @ aee01ebf
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* them return 0 On success and 1 otherwise. * them return 0 On success and 1 otherwise.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_c_ac.c
View file @ aee01ebf
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* them return 0 On success and 1 otherwise. * them return 0 On success and 1 otherwise.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
...@@ -153,8 +153,7 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb) ...@@ -153,8 +153,7 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
rc = 0; rc = 0;
} else if (!LLC_PDU_IS_CMD(pdu) && } else if (!LLC_PDU_IS_CMD(pdu) &&
!LLC_PDU_TYPE_IS_U(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
LLC_U_PDU_CMD(pdu) == LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME) {
LLC_2_PDU_CMD_SABME) {
reason = LLC_RESET_REASON_REMOTE; reason = LLC_RESET_REASON_REMOTE;
rc = 0; rc = 0;
} else { } else {
......
net/llc/llc_c_ev.c
View file @ aee01ebf
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* in their comments, at below. * in their comments, at below.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_c_st.c
View file @ aee01ebf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* or in "llc_c_ac.c" and "llc_c_ev.c" modules. * or in "llc_c_ac.c" and "llc_c_ev.c" modules.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001, 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_conn.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_conn.c - Driver routines for connection component. * llc_conn.c - Driver routines for connection component.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
...@@ -84,7 +84,8 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) ...@@ -84,7 +84,8 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
goto out_kfree_skb; goto out_kfree_skb;
} }
if (!ev->ind_prim && !ev->cfm_prim) { /* indicate or confirm not required */ if (!ev->ind_prim && !ev->cfm_prim) {
/* indicate or confirm not required */
if (!skb->list) if (!skb->list)
goto out_kfree_skb; goto out_kfree_skb;
goto out_skb_put; goto out_skb_put;
......
net/llc/llc_evnt.c
View file @ aee01ebf
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* them return 0 On success and 1 otherwise. * them return 0 On success and 1 otherwise.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_if.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_if.c - Defines LLC interface to upper layer * llc_if.c - Defines LLC interface to upper layer
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_mac.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_mac.c - Manages interface between LLC and MAC * llc_mac.c - Manages interface between LLC and MAC
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
...@@ -78,7 +78,8 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -78,7 +78,8 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
} }
sap = llc_sap_find(pdu->dsap); sap = llc_sap_find(pdu->dsap);
if (!sap) {/* unknown SAP */ if (!sap) {/* unknown SAP */
dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__, pdu->dsap); dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__,
pdu->dsap);
goto drop; goto drop;
} }
llc_decode_pdu_type(skb, &dest); llc_decode_pdu_type(skb, &dest);
......
net/llc/llc_main.c
View file @ aee01ebf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* and connections of the LLC. * and connections of the LLC.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001, 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
...@@ -600,5 +600,5 @@ module_init(llc_init); ...@@ -600,5 +600,5 @@ module_init(llc_init);
module_exit(llc_exit); module_exit(llc_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Procom, 1997, Arnaldo C. Melo, Jay Schullist, 2001, 2002"); MODULE_AUTHOR("Procom, 1997, Arnaldo C. Melo, Jay Schullist, 2001-2003");
MODULE_DESCRIPTION("LLC 2.0, NET4.0 IEEE 802.2 extended support"); MODULE_DESCRIPTION("LLC 2.0, NET4.0 IEEE 802.2 extended support");
net/llc/llc_pdu.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_pdu.c - access to PDU internals * llc_pdu.c - access to PDU internals
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_proc.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* proc_llc.c - proc interface for LLC * proc_llc.c - proc interface for LLC
* *
* Copyright (c) 2001 by Jay Schulist <jschlst@samba.org> * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
* 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2002-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_s_ac.c
View file @ aee01ebf
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* them return 0 On success and 1 otherwise. * them return 0 On success and 1 otherwise.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_s_ev.c
View file @ aee01ebf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* in 802.2 LLC protocol standard document. * in 802.2 LLC protocol standard document.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_s_st.c
View file @ aee01ebf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* which are described in 802.2 LLC protocol standard document. * which are described in 802.2 LLC protocol standard document.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_sap.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_sap.c - driver routines for SAP component. * llc_sap.c - driver routines for SAP component.
* *
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
net/llc/llc_stat.c
View file @ aee01ebf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* llc_stat.c - Implementation of LLC station component state machine * llc_stat.c - Implementation of LLC station component state machine
* transitions * transitions
* Copyright (c) 1997 by Procom Technology, Inc. * Copyright (c) 1997 by Procom Technology, Inc.
* 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* *
* This program can be redistributed or modified under the terms of the * This program can be redistributed or modified under the terms of the
* GNU General Public License as published by the Free Software Foundation. * GNU General Public License as published by the Free Software Foundation.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7