mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
[NET] LLC: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
56d6c3d7a7
commit
d57b1869b2
10 changed files with 43 additions and 43 deletions
|
@ -67,7 +67,7 @@ static inline u16 llc_ui_next_link_no(int sap)
|
|||
static inline __be16 llc_proto_type(u16 arphrd)
|
||||
{
|
||||
return arphrd == ARPHRD_IEEE802_TR ?
|
||||
htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
|
||||
htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -602,7 +602,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
|
|||
int rc = -EOPNOTSUPP;
|
||||
|
||||
dprintk("%s: accepting on %02X\n", __FUNCTION__,
|
||||
llc_sk(sk)->laddr.lsap);
|
||||
llc_sk(sk)->laddr.lsap);
|
||||
lock_sock(sk);
|
||||
if (unlikely(sk->sk_type != SOCK_STREAM))
|
||||
goto out;
|
||||
|
@ -617,7 +617,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
|
|||
goto out;
|
||||
}
|
||||
dprintk("%s: got a new connection on %02X\n", __FUNCTION__,
|
||||
llc_sk(sk)->laddr.lsap);
|
||||
llc_sk(sk)->laddr.lsap);
|
||||
skb = skb_dequeue(&sk->sk_receive_queue);
|
||||
rc = -EINVAL;
|
||||
if (!skb->sk)
|
||||
|
@ -682,7 +682,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
if (flags & MSG_PEEK) {
|
||||
peek_seq = llc->copied_seq;
|
||||
seq = &peek_seq;
|
||||
}
|
||||
}
|
||||
|
||||
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
|
||||
copied = 0;
|
||||
|
@ -1116,11 +1116,11 @@ static const struct proto_ops llc_ui_ops = {
|
|||
};
|
||||
|
||||
static char llc_proc_err_msg[] __initdata =
|
||||
KERN_CRIT "LLC: Unable to register the proc_fs entries\n";
|
||||
KERN_CRIT "LLC: Unable to register the proc_fs entries\n";
|
||||
static char llc_sysctl_err_msg[] __initdata =
|
||||
KERN_CRIT "LLC: Unable to register the sysctl entries\n";
|
||||
KERN_CRIT "LLC: Unable to register the sysctl entries\n";
|
||||
static char llc_sock_err_msg[] __initdata =
|
||||
KERN_CRIT "LLC: Unable to register the network family\n";
|
||||
KERN_CRIT "LLC: Unable to register the network family\n";
|
||||
|
||||
static int __init llc2_init(void)
|
||||
{
|
||||
|
|
|
@ -854,7 +854,7 @@ static void llc_sk_init(struct sock* sk)
|
|||
llc->n2 = 2; /* max retransmit */
|
||||
llc->k = 2; /* tx win size, will adjust dynam */
|
||||
llc->rw = 128; /* rx win size (opt and equal to
|
||||
* tx_win of remote LLC) */
|
||||
* tx_win of remote LLC) */
|
||||
skb_queue_head_init(&llc->pdu_unack_q);
|
||||
sk->sk_backlog_rcv = llc_backlog_rcv;
|
||||
}
|
||||
|
|
|
@ -164,7 +164,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
sap = llc_sap_find(pdu->dsap);
|
||||
if (unlikely(!sap)) {/* unknown SAP */
|
||||
dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__,
|
||||
pdu->dsap);
|
||||
pdu->dsap);
|
||||
goto drop;
|
||||
}
|
||||
/*
|
||||
|
@ -173,9 +173,9 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
*/
|
||||
rcv = rcu_dereference(sap->rcv_func);
|
||||
if (rcv) {
|
||||
struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC);
|
||||
if (cskb)
|
||||
rcv(cskb, dev, pt, orig_dev);
|
||||
struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC);
|
||||
if (cskb)
|
||||
rcv(cskb, dev, pt, orig_dev);
|
||||
}
|
||||
dest = llc_pdu_type(skb);
|
||||
if (unlikely(!dest || !llc_type_handlers[dest - 1]))
|
||||
|
|
|
@ -175,7 +175,7 @@ struct llc_sap_state llc_sap_state_table[LLC_NR_SAP_STATES] = {
|
|||
[LLC_SAP_STATE_INACTIVE - 1] = {
|
||||
.curr_state = LLC_SAP_STATE_INACTIVE,
|
||||
.transitions = llc_sap_inactive_state_transitions,
|
||||
},
|
||||
},
|
||||
[LLC_SAP_STATE_ACTIVE - 1] = {
|
||||
.curr_state = LLC_SAP_STATE_ACTIVE,
|
||||
.transitions = llc_sap_active_state_transitions,
|
||||
|
|
|
@ -116,7 +116,7 @@ static int llc_stat_ev_enable_with_dup_addr_check(struct sk_buff *skb)
|
|||
|
||||
return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
|
||||
ev->prim_type ==
|
||||
LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1;
|
||||
LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1;
|
||||
}
|
||||
|
||||
static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb)
|
||||
|
@ -306,7 +306,7 @@ static int llc_station_ac_send_test_r(struct sk_buff *skb)
|
|||
llc_pdu_decode_sa(skb, mac_da);
|
||||
llc_pdu_decode_ssap(skb, &dsap);
|
||||
llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
|
||||
llc_pdu_init_as_test_rsp(nskb, skb);
|
||||
llc_pdu_init_as_test_rsp(nskb, skb);
|
||||
rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
|
||||
if (unlikely(rc))
|
||||
goto free;
|
||||
|
|
|
@ -72,7 +72,7 @@ static struct ctl_table llc2_dir_timeout_table[] = {
|
|||
.procname = "timeout",
|
||||
.mode = 0555,
|
||||
.child = llc2_timeout_table,
|
||||
},
|
||||
},
|
||||
{ 0 },
|
||||
};
|
||||
|
||||
|
@ -82,7 +82,7 @@ static struct ctl_table llc_table[] = {
|
|||
.procname = "llc2",
|
||||
.mode = 0555,
|
||||
.child = llc2_dir_timeout_table,
|
||||
},
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_LLC_STATION,
|
||||
.procname = "station",
|
||||
|
@ -98,7 +98,7 @@ static struct ctl_table llc_dir_table[] = {
|
|||
.procname = "llc",
|
||||
.mode = 0555,
|
||||
.child = llc_table,
|
||||
},
|
||||
},
|
||||
{ 0 },
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue