Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9441fc3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

[LLC]: Use const in llc_c_ev.c 



Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent af426d32

net/llc/llc_c_ev.c

+68 −66
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ out: 


int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->prim == LLC_CONN_PRIM &&

	       ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -107,7 +107,7 @@ int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->prim == LLC_DATA_PRIM &&

	       ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -115,7 +115,7 @@ int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_disc_req(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->prim == LLC_DISC_PRIM &&

	       ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -123,7 +123,7 @@ int llc_conn_ev_disc_req(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rst_req(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->prim == LLC_RESET_PRIM &&

	       ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -131,7 +131,7 @@ int llc_conn_ev_rst_req(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_local_busy_detected(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&

	       ev->prim_type == LLC_CONN_EV_LOCAL_BUSY_DETECTED ? 0 : 1;
@@ -139,7 +139,7 @@ int llc_conn_ev_local_busy_detected(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_local_busy_cleared(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&

	       ev->prim_type == LLC_CONN_EV_LOCAL_BUSY_CLEARED ? 0 : 1;
@@ -152,7 +152,7 @@ int llc_conn_ev_rx_bad_pdu(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_disc_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&

	       LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_DISC ? 0 : 1;
@@ -160,7 +160,7 @@ int llc_conn_ev_rx_disc_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_dm_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&

	       LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_DM ? 0 : 1;
@@ -168,7 +168,7 @@ int llc_conn_ev_rx_dm_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_frmr_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&

	       LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_FRMR ? 0 : 1;
@@ -176,7 +176,7 @@ int llc_conn_ev_rx_frmr_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_i_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -186,7 +186,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_i_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -197,9 +197,9 @@ int llc_conn_ev_rx_i_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk,

					      struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

	       LLC_I_PF_IS_0(pdu) && ns != vr &&
@@ -209,9 +209,9 @@ int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk, 
int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk,

					      struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

	       LLC_I_PF_IS_1(pdu) && ns != vr &&
@@ -221,10 +221,11 @@ int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk, 
int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,

					     struct sk_buff *skb)

{

	struct llc_pdu_sn * pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	u16 rc = LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&

	const struct llc_pdu_sn * pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);

	const u16 rc = LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

		ns != vr &&

		 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;

	if (!rc)

		dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
@@ -234,7 +235,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk, 


int llc_conn_ev_rx_i_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -244,7 +245,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_i_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

	       LLC_I_PF_IS_1(pdu) &&
@@ -253,7 +254,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_i_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -263,9 +264,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk,

					      struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

	       LLC_I_PF_IS_0(pdu) && ns != vr &&
@@ -275,9 +276,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk, 
int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk,

					      struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

	       LLC_I_PF_IS_1(pdu) && ns != vr &&
@@ -287,9 +288,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk, 
int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk,

					      struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&

	       !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
@@ -298,10 +299,11 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk, 
int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,

					     struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vr = llc_sk(sk)->vR;

	u8 ns = LLC_I_GET_NS(pdu);

	u16 rc = LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vr = llc_sk(sk)->vR;

	const u8 ns = LLC_I_GET_NS(pdu);

	const u16 rc = LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&

		ns != vr &&

		 llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;

	if (!rc)

		dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
@@ -311,7 +313,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk, 


int llc_conn_ev_rx_rej_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_0(pdu) &&
@@ -320,7 +322,7 @@ int llc_conn_ev_rx_rej_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rej_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_1(pdu) &&
@@ -329,7 +331,7 @@ int llc_conn_ev_rx_rej_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rej_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_0(pdu) &&
@@ -338,7 +340,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rej_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_1(pdu) &&
@@ -347,7 +349,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rej_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_REJ ? 0 : 1;
@@ -355,7 +357,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rnr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_0(pdu) &&
@@ -364,7 +366,7 @@ int llc_conn_ev_rx_rnr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rnr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_1(pdu) &&
@@ -373,7 +375,7 @@ int llc_conn_ev_rx_rnr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rnr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_0(pdu) &&
@@ -382,7 +384,7 @@ int llc_conn_ev_rx_rnr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rnr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_1(pdu) &&
@@ -391,7 +393,7 @@ int llc_conn_ev_rx_rnr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_0(pdu) &&
@@ -400,7 +402,7 @@ int llc_conn_ev_rx_rr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&

	       LLC_S_PF_IS_1(pdu) &&
@@ -409,7 +411,7 @@ int llc_conn_ev_rx_rr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
@@ -419,7 +421,7 @@ int llc_conn_ev_rx_rr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_rr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	return llc_conn_space(sk, skb) &&

	       LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
@@ -429,7 +431,7 @@ int llc_conn_ev_rx_rr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_rx_sabme_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&

	       LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME ? 0 : 1;
@@ -446,7 +448,7 @@ int llc_conn_ev_rx_ua_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_xxx_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	if (LLC_PDU_IS_CMD(pdu)) {

		if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
@@ -461,7 +463,7 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	if (LLC_PDU_IS_CMD(pdu)) {

		if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
@@ -480,7 +482,7 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_xxx_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);



	if (LLC_PDU_IS_RSP(pdu)) {

		if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
@@ -502,7 +504,7 @@ int llc_conn_ev_rx_xxx_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb) 
int llc_conn_ev_rx_xxx_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);

	const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);



	if (LLC_PDU_IS_RSP(pdu)) {

		if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
@@ -524,9 +526,9 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk, 
					       struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vs = llc_sk(sk)->vS;

	u8 nr = LLC_I_GET_NR(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vs = llc_sk(sk)->vS;

	const u8 nr = LLC_I_GET_NR(pdu);



	if (LLC_PDU_IS_CMD(pdu) &&

	    (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
@@ -542,9 +544,9 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk, 
					       struct sk_buff *skb)

{

	u16 rc = 1;

	struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	u8 vs = llc_sk(sk)->vS;

	u8 nr = LLC_I_GET_NR(pdu);

	const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);

	const u8 vs = llc_sk(sk)->vS;

	const u8 nr = LLC_I_GET_NR(pdu);



	if (LLC_PDU_IS_RSP(pdu) &&

	    (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
@@ -563,28 +565,28 @@ int llc_conn_ev_rx_any_frame(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_p_tmr_exp(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type != LLC_CONN_EV_TYPE_P_TMR;

}



int llc_conn_ev_ack_tmr_exp(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type != LLC_CONN_EV_TYPE_ACK_TMR;

}



int llc_conn_ev_rej_tmr_exp(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type != LLC_CONN_EV_TYPE_REJ_TMR;

}



int llc_conn_ev_busy_tmr_exp(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type != LLC_CONN_EV_TYPE_BUSY_TMR;

}
@@ -596,7 +598,7 @@ int llc_conn_ev_init_p_f_cycle(struct sock *sk, struct sk_buff *skb) 


int llc_conn_ev_tx_buffer_full(struct sock *sk, struct sk_buff *skb)

{

	struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	const struct llc_conn_state_ev *ev = llc_conn_ev(skb);



	return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&

	       ev->prim_type == LLC_CONN_EV_TX_BUFF_FULL ? 0 : 1;