aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/llc/af_llc.c18
-rw-r--r--net/llc/llc_conn.c2
-rw-r--r--net/llc/llc_input.c8
-rw-r--r--net/llc/llc_output.c2
-rw-r--r--net/llc/llc_pdu.c2
-rw-r--r--net/llc/llc_proc.c16
-rw-r--r--net/llc/llc_s_st.c2
-rw-r--r--net/llc/llc_sap.c6
-rw-r--r--net/llc/llc_station.c22
-rw-r--r--net/llc/sysctl_net_llc.c8
10 files changed, 43 insertions, 43 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)
67static inline __be16 llc_proto_type(u16 arphrd) 67static 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
1118static char llc_proc_err_msg[] __initdata = 1118static 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";
1120static char llc_sysctl_err_msg[] __initdata = 1120static 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";
1122static char llc_sock_err_msg[] __initdata = 1122static 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
1125static int __init llc2_init(void) 1125static int __init llc2_init(void)
1126{ 1126{
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index c761c15da421..3b8cfbe029a7 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -854,7 +854,7 @@ static void llc_sk_init(struct sock* sk)
854 llc->n2 = 2; /* max retransmit */ 854 llc->n2 = 2; /* max retransmit */
855 llc->k = 2; /* tx win size, will adjust dynam */ 855 llc->k = 2; /* tx win size, will adjust dynam */
856 llc->rw = 128; /* rx win size (opt and equal to 856 llc->rw = 128; /* rx win size (opt and equal to
857 * tx_win of remote LLC) */ 857 * tx_win of remote LLC) */
858 skb_queue_head_init(&llc->pdu_unack_q); 858 skb_queue_head_init(&llc->pdu_unack_q);
859 sk->sk_backlog_rcv = llc_backlog_rcv; 859 sk->sk_backlog_rcv = llc_backlog_rcv;
860} 860}
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index db82aff6e40f..b3f65d1e80b1 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -164,7 +164,7 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
164 sap = llc_sap_find(pdu->dsap); 164 sap = llc_sap_find(pdu->dsap);
165 if (unlikely(!sap)) {/* unknown SAP */ 165 if (unlikely(!sap)) {/* unknown SAP */
166 dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__, 166 dprintk("%s: llc_sap_find(%02X) failed!\n", __FUNCTION__,
167 pdu->dsap); 167 pdu->dsap);
168 goto drop; 168 goto drop;
169 } 169 }
170 /* 170 /*
@@ -173,9 +173,9 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
173 */ 173 */
174 rcv = rcu_dereference(sap->rcv_func); 174 rcv = rcu_dereference(sap->rcv_func);
175 if (rcv) { 175 if (rcv) {
176 struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC); 176 struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC);
177 if (cskb) 177 if (cskb)
178 rcv(cskb, dev, pt, orig_dev); 178 rcv(cskb, dev, pt, orig_dev);
179 } 179 }
180 dest = llc_pdu_type(skb); 180 dest = llc_pdu_type(skb);
181 if (unlikely(!dest || !llc_type_handlers[dest - 1])) 181 if (unlikely(!dest || !llc_type_handlers[dest - 1]))
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index b4e668e0e12c..f4291f349e92 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -40,7 +40,7 @@ int llc_mac_hdr_init(struct sk_buff *skb,
40 case ARPHRD_IEEE802_TR: { 40 case ARPHRD_IEEE802_TR: {
41 struct net_device *dev = skb->dev; 41 struct net_device *dev = skb->dev;
42 struct trh_hdr *trh; 42 struct trh_hdr *trh;
43 43
44 skb->mac.raw = skb_push(skb, sizeof(*trh)); 44 skb->mac.raw = skb_push(skb, sizeof(*trh));
45 trh = tr_hdr(skb); 45 trh = tr_hdr(skb);
46 trh->ac = AC; 46 trh->ac = AC;
diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c
index a28ce525d201..fa8324396db3 100644
--- a/net/llc/llc_pdu.c
+++ b/net/llc/llc_pdu.c
@@ -39,7 +39,7 @@ void llc_pdu_set_pf_bit(struct sk_buff *skb, u8 bit_value)
39 39
40 llc_pdu_decode_pdu_type(skb, &pdu_type); 40 llc_pdu_decode_pdu_type(skb, &pdu_type);
41 pdu = llc_pdu_sn_hdr(skb); 41 pdu = llc_pdu_sn_hdr(skb);
42 42
43 switch (pdu_type) { 43 switch (pdu_type) {
44 case LLC_PDU_TYPE_I: 44 case LLC_PDU_TYPE_I:
45 case LLC_PDU_TYPE_S: 45 case LLC_PDU_TYPE_S:
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 19308fece3ad..dcfe6c739471 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -142,18 +142,18 @@ out:
142} 142}
143 143
144static char *llc_conn_state_names[] = { 144static char *llc_conn_state_names[] = {
145 [LLC_CONN_STATE_ADM] = "adm", 145 [LLC_CONN_STATE_ADM] = "adm",
146 [LLC_CONN_STATE_SETUP] = "setup", 146 [LLC_CONN_STATE_SETUP] = "setup",
147 [LLC_CONN_STATE_NORMAL] = "normal", 147 [LLC_CONN_STATE_NORMAL] = "normal",
148 [LLC_CONN_STATE_BUSY] = "busy", 148 [LLC_CONN_STATE_BUSY] = "busy",
149 [LLC_CONN_STATE_REJ] = "rej", 149 [LLC_CONN_STATE_REJ] = "rej",
150 [LLC_CONN_STATE_AWAIT] = "await", 150 [LLC_CONN_STATE_AWAIT] = "await",
151 [LLC_CONN_STATE_AWAIT_BUSY] = "await_busy", 151 [LLC_CONN_STATE_AWAIT_BUSY] = "await_busy",
152 [LLC_CONN_STATE_AWAIT_REJ] = "await_rej", 152 [LLC_CONN_STATE_AWAIT_REJ] = "await_rej",
153 [LLC_CONN_STATE_D_CONN] = "d_conn", 153 [LLC_CONN_STATE_D_CONN] = "d_conn",
154 [LLC_CONN_STATE_RESET] = "reset", 154 [LLC_CONN_STATE_RESET] = "reset",
155 [LLC_CONN_STATE_ERROR] = "error", 155 [LLC_CONN_STATE_ERROR] = "error",
156 [LLC_CONN_STATE_TEMP] = "temp", 156 [LLC_CONN_STATE_TEMP] = "temp",
157}; 157};
158 158
159static int llc_seq_core_show(struct seq_file *seq, void *v) 159static int llc_seq_core_show(struct seq_file *seq, void *v)
diff --git a/net/llc/llc_s_st.c b/net/llc/llc_s_st.c
index 6a43201aa32e..135f7d80069e 100644
--- a/net/llc/llc_s_st.c
+++ b/net/llc/llc_s_st.c
@@ -175,7 +175,7 @@ struct llc_sap_state llc_sap_state_table[LLC_NR_SAP_STATES] = {
175 [LLC_SAP_STATE_INACTIVE - 1] = { 175 [LLC_SAP_STATE_INACTIVE - 1] = {
176 .curr_state = LLC_SAP_STATE_INACTIVE, 176 .curr_state = LLC_SAP_STATE_INACTIVE,
177 .transitions = llc_sap_inactive_state_transitions, 177 .transitions = llc_sap_inactive_state_transitions,
178 }, 178 },
179 [LLC_SAP_STATE_ACTIVE - 1] = { 179 [LLC_SAP_STATE_ACTIVE - 1] = {
180 .curr_state = LLC_SAP_STATE_ACTIVE, 180 .curr_state = LLC_SAP_STATE_ACTIVE,
181 .transitions = llc_sap_active_state_transitions, 181 .transitions = llc_sap_active_state_transitions,
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 61cb8cf7d153..2615dc81aa36 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -201,7 +201,7 @@ static void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb)
201 if (sock_queue_rcv_skb(skb->sk, skb)) 201 if (sock_queue_rcv_skb(skb->sk, skb))
202 kfree_skb(skb); 202 kfree_skb(skb);
203 } 203 }
204 } 204 }
205 kfree_skb(skb); 205 kfree_skb(skb);
206} 206}
207 207
@@ -215,7 +215,7 @@ static void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb)
215 * This function is called when upper layer wants to send a TEST pdu. 215 * This function is called when upper layer wants to send a TEST pdu.
216 * Returns 0 for success, 1 otherwise. 216 * Returns 0 for success, 1 otherwise.
217 */ 217 */
218void llc_build_and_send_test_pkt(struct llc_sap *sap, 218void llc_build_and_send_test_pkt(struct llc_sap *sap,
219 struct sk_buff *skb, u8 *dmac, u8 dsap) 219 struct sk_buff *skb, u8 *dmac, u8 dsap)
220{ 220{
221 struct llc_sap_state_ev *ev = llc_sap_ev(skb); 221 struct llc_sap_state_ev *ev = llc_sap_ev(skb);
@@ -224,7 +224,7 @@ void llc_build_and_send_test_pkt(struct llc_sap *sap,
224 ev->daddr.lsap = dsap; 224 ev->daddr.lsap = dsap;
225 memcpy(ev->saddr.mac, skb->dev->dev_addr, IFHWADDRLEN); 225 memcpy(ev->saddr.mac, skb->dev->dev_addr, IFHWADDRLEN);
226 memcpy(ev->daddr.mac, dmac, IFHWADDRLEN); 226 memcpy(ev->daddr.mac, dmac, IFHWADDRLEN);
227 227
228 ev->type = LLC_SAP_EV_TYPE_PRIM; 228 ev->type = LLC_SAP_EV_TYPE_PRIM;
229 ev->prim = LLC_TEST_PRIM; 229 ev->prim = LLC_TEST_PRIM;
230 ev->prim_type = LLC_PRIM_TYPE_REQ; 230 ev->prim_type = LLC_PRIM_TYPE_REQ;
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index 8275bd33bd9d..576355a192ab 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -112,17 +112,17 @@ static struct llc_station llc_main_station;
112 112
113static int llc_stat_ev_enable_with_dup_addr_check(struct sk_buff *skb) 113static int llc_stat_ev_enable_with_dup_addr_check(struct sk_buff *skb)
114{ 114{
115 struct llc_station_state_ev *ev = llc_station_ev(skb); 115 struct llc_station_state_ev *ev = llc_station_ev(skb);
116 116
117 return ev->type == LLC_STATION_EV_TYPE_SIMPLE && 117 return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
118 ev->prim_type == 118 ev->prim_type ==
119 LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1; 119 LLC_STATION_EV_ENABLE_WITH_DUP_ADDR_CHECK ? 0 : 1;
120} 120}
121 121
122static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb) 122static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb)
123{ 123{
124 struct llc_station_state_ev *ev = llc_station_ev(skb); 124 struct llc_station_state_ev *ev = llc_station_ev(skb);
125 125
126 return ev->type == LLC_STATION_EV_TYPE_SIMPLE && 126 return ev->type == LLC_STATION_EV_TYPE_SIMPLE &&
127 ev->prim_type == 127 ev->prim_type ==
128 LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK ? 0 : 1; 128 LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK ? 0 : 1;
@@ -130,8 +130,8 @@ static int llc_stat_ev_enable_without_dup_addr_check(struct sk_buff *skb)
130 130
131static int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct sk_buff *skb) 131static int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct sk_buff *skb)
132{ 132{
133 struct llc_station_state_ev *ev = llc_station_ev(skb); 133 struct llc_station_state_ev *ev = llc_station_ev(skb);
134 134
135 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR && 135 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
136 llc_main_station.retry_count < 136 llc_main_station.retry_count <
137 llc_main_station.maximum_retry ? 0 : 1; 137 llc_main_station.maximum_retry ? 0 : 1;
@@ -139,8 +139,8 @@ static int llc_stat_ev_ack_tmr_exp_lt_retry_cnt_max_retry(struct sk_buff *skb)
139 139
140static int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct sk_buff *skb) 140static int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct sk_buff *skb)
141{ 141{
142 struct llc_station_state_ev *ev = llc_station_ev(skb); 142 struct llc_station_state_ev *ev = llc_station_ev(skb);
143 143
144 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR && 144 return ev->type == LLC_STATION_EV_TYPE_ACK_TMR &&
145 llc_main_station.retry_count == 145 llc_main_station.retry_count ==
146 llc_main_station.maximum_retry ? 0 : 1; 146 llc_main_station.maximum_retry ? 0 : 1;
@@ -148,7 +148,7 @@ static int llc_stat_ev_ack_tmr_exp_eq_retry_cnt_max_retry(struct sk_buff *skb)
148 148
149static int llc_stat_ev_rx_null_dsap_xid_c(struct sk_buff *skb) 149static int llc_stat_ev_rx_null_dsap_xid_c(struct sk_buff *skb)
150{ 150{
151 struct llc_station_state_ev *ev = llc_station_ev(skb); 151 struct llc_station_state_ev *ev = llc_station_ev(skb);
152 struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb); 152 struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
153 153
154 return ev->type == LLC_STATION_EV_TYPE_PDU && 154 return ev->type == LLC_STATION_EV_TYPE_PDU &&
@@ -306,7 +306,7 @@ static int llc_station_ac_send_test_r(struct sk_buff *skb)
306 llc_pdu_decode_sa(skb, mac_da); 306 llc_pdu_decode_sa(skb, mac_da);
307 llc_pdu_decode_ssap(skb, &dsap); 307 llc_pdu_decode_ssap(skb, &dsap);
308 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP); 308 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
309 llc_pdu_init_as_test_rsp(nskb, skb); 309 llc_pdu_init_as_test_rsp(nskb, skb);
310 rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da); 310 rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
311 if (unlikely(rc)) 311 if (unlikely(rc))
312 goto free; 312 goto free;
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c
index 45d7dd92a088..d047a3e15714 100644
--- a/net/llc/sysctl_net_llc.c
+++ b/net/llc/sysctl_net_llc.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * sysctl_net_llc.c: sysctl interface to LLC net subsystem. 2 * sysctl_net_llc.c: sysctl interface to LLC net subsystem.
3 * 3 *
4 * Arnaldo Carvalho de Melo <acme@conectiva.com.br> 4 * Arnaldo Carvalho de Melo <acme@conectiva.com.br>
5 */ 5 */
6 6
@@ -72,7 +72,7 @@ static struct ctl_table llc2_dir_timeout_table[] = {
72 .procname = "timeout", 72 .procname = "timeout",
73 .mode = 0555, 73 .mode = 0555,
74 .child = llc2_timeout_table, 74 .child = llc2_timeout_table,
75 }, 75 },
76 { 0 }, 76 { 0 },
77}; 77};
78 78
@@ -82,7 +82,7 @@ static struct ctl_table llc_table[] = {
82 .procname = "llc2", 82 .procname = "llc2",
83 .mode = 0555, 83 .mode = 0555,
84 .child = llc2_dir_timeout_table, 84 .child = llc2_dir_timeout_table,
85 }, 85 },
86 { 86 {
87 .ctl_name = NET_LLC_STATION, 87 .ctl_name = NET_LLC_STATION,
88 .procname = "station", 88 .procname = "station",
@@ -98,7 +98,7 @@ static struct ctl_table llc_dir_table[] = {
98 .procname = "llc", 98 .procname = "llc",
99 .mode = 0555, 99 .mode = 0555,
100 .child = llc_table, 100 .child = llc_table,
101 }, 101 },
102 { 0 }, 102 { 0 },
103}; 103};
104 104