aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/llc_station.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/llc/llc_station.c')
-rw-r--r--net/llc/llc_station.c22
1 files changed, 11 insertions, 11 deletions
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;