o llc: don't use inverted logic

I don't understand what was on the mind of Procom programmers,
why do all this inverted logic? Its plain confusing, revert it.
Thanks to DaveM for asking if the logic was inverted, I should
have killed this weird stuff a long time ago :-\

diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index 02145e59174cf8ae269d57228e5fa1437bb335ab..235e6c0bc17ef281453634f26bb5dc9bf24831c5 100644 (file)
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -39,8 +39,8 @@
 #define LLC_PDU_CMD_RSP_MASK   0x01
 #define LLC_PDU_CMD            0
 #define LLC_PDU_RSP            1
-#define LLC_PDU_IS_CMD(pdu)    ((pdu->ssap & LLC_PDU_RSP) ? 1 : 0)
-#define LLC_PDU_IS_RSP(pdu)    ((pdu->ssap & LLC_PDU_RSP) ? 0 : 1)
+#define LLC_PDU_IS_CMD(pdu)    ((pdu->ssap & LLC_PDU_RSP) ? 0 : 1)
+#define LLC_PDU_IS_RSP(pdu)    ((pdu->ssap & LLC_PDU_RSP) ? 1 : 0)
 
 /* Get PDU type from 2 lowest-order bits of control field first byte */
 #define LLC_PDU_TYPE_I_MASK    0x01    /* 16-bit control field */
@@ -53,18 +53,18 @@
 #define LLC_PDU_TYPE_U 3       /* first two bits */
 
 #define LLC_PDU_TYPE_IS_I(pdu) \
-       ((!(pdu->ctrl_1 & LLC_PDU_TYPE_I_MASK)) ? 0 : 1)
+       ((!(pdu->ctrl_1 & LLC_PDU_TYPE_I_MASK)) ? 1 : 0)
 
 #define LLC_PDU_TYPE_IS_U(pdu) \
-       (((pdu->ctrl_1 & LLC_PDU_TYPE_U_MASK) == LLC_PDU_TYPE_U) ? 0 : 1)
+       (((pdu->ctrl_1 & LLC_PDU_TYPE_U_MASK) == LLC_PDU_TYPE_U) ? 1 : 0)
 
 #define LLC_PDU_TYPE_IS_S(pdu) \
-       (((pdu->ctrl_1 & LLC_PDU_TYPE_S_MASK) == LLC_PDU_TYPE_S) ? 0 : 1)
+       (((pdu->ctrl_1 & LLC_PDU_TYPE_S_MASK) == LLC_PDU_TYPE_S) ? 1 : 0)
 
 /* U-format PDU control field masks */
 #define LLC_U_PF_BIT_MASK      0x10    /* P/F bit mask */
-#define LLC_U_PF_IS_1(pdu)     ((pdu->ctrl_1 & LLC_U_PF_BIT_MASK) ? 0 : 1)
-#define LLC_U_PF_IS_0(pdu)     ((!(pdu->ctrl_1 & LLC_U_PF_BIT_MASK)) ? 0 : 1)
+#define LLC_U_PF_IS_1(pdu)     ((pdu->ctrl_1 & LLC_U_PF_BIT_MASK) ? 1 : 0)
+#define LLC_U_PF_IS_0(pdu)     ((!(pdu->ctrl_1 & LLC_U_PF_BIT_MASK)) ? 1 : 0)
 
 #define LLC_U_PDU_CMD_MASK     0xEC    /* cmd/rsp mask */
 #define LLC_U_PDU_CMD(pdu)     (pdu->ctrl_1 & LLC_U_PDU_CMD_MASK)
@@ -119,8 +119,8 @@
 
 #define LLC_I_PF_BIT_MASK      0x01
 
-#define LLC_I_PF_IS_0(pdu)     ((!(pdu->ctrl_2 & LLC_I_PF_BIT_MASK)) ? 0 : 1)
-#define LLC_I_PF_IS_1(pdu)     ((pdu->ctrl_2 & LLC_I_PF_BIT_MASK) ? 0 : 1)
+#define LLC_I_PF_IS_0(pdu)     ((!(pdu->ctrl_2 & LLC_I_PF_BIT_MASK)) ? 1 : 0)
+#define LLC_I_PF_IS_1(pdu)     ((pdu->ctrl_2 & LLC_I_PF_BIT_MASK) ? 1 : 0)
 
 /* S-PDU supervisory commands and responses */
 
@@ -136,8 +136,8 @@
 #define LLC_2_PDU_RSP_RNR      0x04    /* rx not ready rsp */
 
 #define LLC_S_PF_BIT_MASK      0x01
-#define LLC_S_PF_IS_0(pdu)     ((!(pdu->ctrl_2 & LLC_S_PF_BIT_MASK)) ? 0 : 1)
-#define LLC_S_PF_IS_1(pdu)     ((pdu->ctrl_2 & LLC_S_PF_BIT_MASK) ? 0 : 1)
+#define LLC_S_PF_IS_0(pdu)     ((!(pdu->ctrl_2 & LLC_S_PF_BIT_MASK)) ? 1 : 0)
+#define LLC_S_PF_IS_1(pdu)     ((pdu->ctrl_2 & LLC_S_PF_BIT_MASK) ? 1 : 0)
 
 #define PDU_SUPV_GET_Nr(pdu)   ((pdu->ctrl_2 & 0xFE) >> 1)
 #define PDU_GET_NEXT_Vr(sn)    (++sn & ~LLC_2_SEQ_NBR_MODULO)

diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index 08ee90b3fed337c873706f78b929a084a8471559..d7f35bf275a705c0cbc14bf9093bc2e6d254add8 100644 (file)
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -102,13 +102,13 @@ int llc_conn_ac_disc_ind(struct sock *sk, struct sk_buff *skb)
        if (ev->type == LLC_CONN_EV_TYPE_PDU) {
                struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-               if (!LLC_PDU_IS_RSP(pdu) &&
-                   !LLC_PDU_TYPE_IS_U(pdu) &&
+               if (LLC_PDU_IS_RSP(pdu) &&
+                   LLC_PDU_TYPE_IS_U(pdu) &&
                    LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_DM) {
                        reason = LLC_DISC_REASON_RX_DM_RSP_PDU;
                        rc = 0;
-               } else if (!LLC_PDU_IS_CMD(pdu) &&
-                          !LLC_PDU_TYPE_IS_U(pdu) &&
+               } else if (LLC_PDU_IS_CMD(pdu) &&
+                          LLC_PDU_TYPE_IS_U(pdu) &&
                           LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_DISC) {
                        reason = LLC_DISC_REASON_RX_DISC_CMD_PDU;
                        rc = 0;
@@ -146,13 +146,13 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
 
        switch (ev->type) {
        case LLC_CONN_EV_TYPE_PDU:
-               if (!LLC_PDU_IS_RSP(pdu) &&
-                   !LLC_PDU_TYPE_IS_U(pdu) &&
+               if (LLC_PDU_IS_RSP(pdu) &&
+                   LLC_PDU_TYPE_IS_U(pdu) &&
                    LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_FRMR) {
                        reason = LLC_RESET_REASON_LOCAL;
                        rc = 0;
-               } else if (!LLC_PDU_IS_CMD(pdu) &&
-                          !LLC_PDU_TYPE_IS_U(pdu) &&
+               } else if (LLC_PDU_IS_CMD(pdu) &&
+                          LLC_PDU_TYPE_IS_U(pdu) &&
                           LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME) {
                        reason = LLC_RESET_REASON_REMOTE;
                        rc = 0;
@@ -198,9 +198,9 @@ int llc_conn_ac_clear_remote_busy_if_f_eq_1(struct sock *sk,
 {
        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
-       if (!LLC_PDU_IS_RSP(pdu) &&
-           !LLC_PDU_TYPE_IS_I(pdu) &&
-           !LLC_I_PF_IS_1(pdu) && llc_sk(sk)->ack_pf)
+       if (LLC_PDU_IS_RSP(pdu) &&
+           LLC_PDU_TYPE_IS_I(pdu) &&
+           LLC_I_PF_IS_1(pdu) && llc_sk(sk)->ack_pf)
                llc_conn_ac_clear_remote_busy(sk, skb);
        return 0;
 }
@@ -310,7 +310,7 @@ int llc_conn_ac_send_frmr_rsp_f_set_x(struct sock *sk, struct sk_buff *skb)
        struct llc_opt *llc = llc_sk(sk);
 
        llc->rx_pdu_hdr = *((u32 *)pdu);
-       if (!LLC_PDU_IS_CMD(pdu))
+       if (LLC_PDU_IS_CMD(pdu))
                llc_pdu_decode_pf_bit(skb, &f_bit);
        else
                f_bit = 0;
@@ -1228,7 +1228,7 @@ int llc_conn_ac_upd_p_flag(struct sock *sk, struct sk_buff *skb)
 {
        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
-       if (!LLC_PDU_IS_RSP(pdu)) {
+       if (LLC_PDU_IS_RSP(pdu)) {
                u8 f_bit;
 
                llc_pdu_decode_pf_bit(skb, &f_bit);

diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c
index 883e550afe244e69c336b3e201d3a5d0080e3f3d..77d630de218679f5a9aead6c8e8d3bc9a5d8e71a 100644 (file)
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -170,7 +170,7 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_DISC ? 0 : 1;
 }
 
@@ -178,7 +178,7 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_DM ? 0 : 1;
 }
 
@@ -186,7 +186,7 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_FRMR ? 0 : 1;
 }
 
@@ -195,8 +195,8 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_I(pdu) &&
-              !LLC_I_PF_IS_0(pdu) &&
+              LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_0(pdu) &&
               LLC_I_GET_NS(pdu) == llc_sk(sk)->vR ? 0 : 1;
 }
 
@@ -205,8 +205,8 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_I(pdu) &&
-              !LLC_I_PF_IS_1(pdu) &&
+              LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_1(pdu) &&
               LLC_I_GET_NS(pdu) == llc_sk(sk)->vR ? 0 : 1;
 }
 
@@ -217,8 +217,8 @@ int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk,
        u8 vr = llc_sk(sk)->vR;
        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 &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_0(pdu) && ns != vr &&
               !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
 }
 
@@ -229,8 +229,8 @@ int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk,
        u8 vr = llc_sk(sk)->vR;
        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 &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_1(pdu) && ns != vr &&
               !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
 }
 
@@ -240,7 +240,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
        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 &&
+       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",
@@ -253,8 +253,8 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_I(pdu) &&
-              !LLC_I_PF_IS_0(pdu) &&
+              LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_0(pdu) &&
               LLC_I_GET_NS(pdu) == llc_sk(sk)->vR ? 0 : 1;
 }
 
@@ -262,8 +262,8 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_I(pdu) &&
-              !LLC_I_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_1(pdu) &&
               LLC_I_GET_NS(pdu) == llc_sk(sk)->vR ? 0 : 1;
 }
 
@@ -272,7 +272,7 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
               LLC_I_GET_NS(pdu) == llc_sk(sk)->vR ? 0 : 1;
 }
 
@@ -283,8 +283,8 @@ int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk,
        u8 vr = llc_sk(sk)->vR;
        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 &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_0(pdu) && ns != vr &&
               !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
 }
 
@@ -295,8 +295,8 @@ int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk,
        u8 vr = llc_sk(sk)->vR;
        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 &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+              LLC_I_PF_IS_1(pdu) && ns != vr &&
               !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
 }
 
@@ -307,7 +307,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk,
        u8 vr = llc_sk(sk)->vR;
        u8 ns = LLC_I_GET_NS(pdu);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&
+       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;
 }
 
@@ -317,7 +317,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
        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 &&
+       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",
@@ -329,8 +329,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_REJ ? 0 : 1;
 }
 
@@ -338,8 +338,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_REJ ? 0 : 1;
 }
 
@@ -347,8 +347,8 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_REJ ? 0 : 1;
 }
 
@@ -356,8 +356,8 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_REJ ? 0 : 1;
 }
 
@@ -365,7 +365,7 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_REJ ? 0 : 1;
 }
 
@@ -373,8 +373,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_RNR ? 0 : 1;
 }
 
@@ -382,8 +382,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_RNR ? 0 : 1;
 }
 
@@ -391,8 +391,8 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_RNR ? 0 : 1;
 }
 
@@ -400,8 +400,8 @@ 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);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_RNR ? 0 : 1;
 }
 
@@ -409,8 +409,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_RR ? 0 : 1;
 }
 
@@ -418,8 +418,8 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_CMD(pdu) == LLC_2_PDU_CMD_RR ? 0 : 1;
 }
 
@@ -428,8 +428,8 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_0(pdu) &&
+              LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_0(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_RR ? 0 : 1;
 }
 
@@ -438,8 +438,8 @@ 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);
 
        return llc_conn_space(sk, skb) &&
-              !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_S(pdu) &&
-              !LLC_S_PF_IS_1(pdu) &&
+              LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
+              LLC_S_PF_IS_1(pdu) &&
               LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_RR ? 0 : 1;
 }
 
@@ -447,7 +447,7 @@ 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);
 
-       return !LLC_PDU_IS_CMD(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
+       return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME ? 0 : 1;
 }
 
@@ -455,7 +455,7 @@ int llc_conn_ev_rx_ua_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return !LLC_PDU_IS_RSP(pdu) && !LLC_PDU_TYPE_IS_U(pdu) &&
+       return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_UA ? 0 : 1;
 }
 
@@ -464,11 +464,11 @@ 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);
 
-       if (!LLC_PDU_IS_CMD(pdu)) {
-               if (!LLC_PDU_TYPE_IS_I(pdu) || !LLC_PDU_TYPE_IS_S(pdu)) {
-                       if (!LLC_I_PF_IS_1(pdu))
+       if (LLC_PDU_IS_CMD(pdu)) {
+               if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
+                       if (LLC_I_PF_IS_1(pdu))
                                rc = 0;
-               } else if (!LLC_PDU_TYPE_IS_U(pdu) && !LLC_U_PF_IS_1(pdu))
+               } else if (LLC_PDU_TYPE_IS_U(pdu) && LLC_U_PF_IS_1(pdu))
                        rc = 0;
        }
        return rc;
@@ -479,15 +479,15 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
        u16 rc = 1;
        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)) {
-                       if (!LLC_I_PF_IS_0(pdu))
+       if (LLC_PDU_IS_CMD(pdu)) {
+               if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
+                       if (LLC_I_PF_IS_0(pdu))
                                rc = 0;
-               } else if (!LLC_PDU_TYPE_IS_U(pdu))
+               } else if (LLC_PDU_TYPE_IS_U(pdu))
                        switch (LLC_U_PDU_CMD(pdu)) {
                        case LLC_2_PDU_CMD_SABME:
                        case LLC_2_PDU_CMD_DISC:
-                               if (!LLC_U_PF_IS_0(pdu))
+                               if (LLC_U_PF_IS_0(pdu))
                                        rc = 0;
                                break;
                        }
@@ -500,10 +500,10 @@ 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);
 
-       if (!LLC_PDU_IS_CMD(pdu)) {
-               if (!LLC_PDU_TYPE_IS_I(pdu) || !LLC_PDU_TYPE_IS_S(pdu))
+       if (LLC_PDU_IS_CMD(pdu)) {
+               if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
                        rc = 0;
-               else if (!LLC_PDU_TYPE_IS_U(pdu))
+               else if (LLC_PDU_TYPE_IS_U(pdu))
                        switch (LLC_U_PDU_CMD(pdu)) {
                        case LLC_2_PDU_CMD_SABME:
                        case LLC_2_PDU_CMD_DISC:
@@ -519,16 +519,16 @@ 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);
 
-       if (!LLC_PDU_IS_RSP(pdu)) {
-               if (!LLC_PDU_TYPE_IS_I(pdu) || !LLC_PDU_TYPE_IS_S(pdu)) {
-                       if (!LLC_I_PF_IS_1(pdu))
+       if (LLC_PDU_IS_RSP(pdu)) {
+               if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
+                       if (LLC_I_PF_IS_1(pdu))
                                rc = 0;
-               } else if (!LLC_PDU_TYPE_IS_U(pdu))
+               } else if (LLC_PDU_TYPE_IS_U(pdu))
                        switch (LLC_U_PDU_RSP(pdu)) {
                        case LLC_2_PDU_RSP_UA:
                        case LLC_2_PDU_RSP_DM:
                        case LLC_2_PDU_RSP_FRMR:
-                               if (!LLC_U_PF_IS_1(pdu))
+                               if (LLC_U_PF_IS_1(pdu))
                                        rc = 0;
                                break;
                        }
@@ -541,10 +541,10 @@ 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);
 
-       if (!LLC_PDU_IS_RSP(pdu)) {
-               if (!LLC_PDU_TYPE_IS_I(pdu) || !LLC_PDU_TYPE_IS_S(pdu))
+       if (LLC_PDU_IS_RSP(pdu)) {
+               if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
                        rc = 0;
-               else if (!LLC_PDU_TYPE_IS_U(pdu))
+               else if (LLC_PDU_TYPE_IS_U(pdu))
                        switch (LLC_U_PDU_RSP(pdu)) {
                        case LLC_2_PDU_RSP_UA:
                        case LLC_2_PDU_RSP_DM:
@@ -562,9 +562,9 @@ int llc_conn_ev_rx_xxx_yyy(struct sock *sk, struct sk_buff *skb)
        u16 rc = 1;
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       if (!LLC_PDU_TYPE_IS_I(pdu) || !LLC_PDU_TYPE_IS_S(pdu))
+       if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
                rc = 0;
-       else if (!LLC_PDU_TYPE_IS_U(pdu))
+       else if (LLC_PDU_TYPE_IS_U(pdu))
                switch (LLC_U_PDU_CMD(pdu)) {
                case LLC_2_PDU_CMD_SABME:
                case LLC_2_PDU_CMD_DISC:
@@ -585,8 +585,8 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
        u8 vs = llc_sk(sk)->vS;
        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)) &&
+       if (LLC_PDU_IS_CMD(pdu) &&
+           (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
            nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
                dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
                        __FUNCTION__, llc_sk(sk)->state, vs, nr);
@@ -603,8 +603,8 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
        u8 vs = llc_sk(sk)->vS;
        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)) &&
+       if (LLC_PDU_IS_RSP(pdu) &&
+           (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
            nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
                rc = 0;
                dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index ccc2143f353ef4ad34048589d1874552a98be2a2..3fbb3fe45125e73cd2ef1e51633287e042eed2ab 100644 (file)
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -356,7 +356,7 @@ static void llc_conn_send_pdus(struct sock *sk)
        while ((skb = skb_dequeue(&sk->sk_write_queue)) != NULL) {
                struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
-               if (!LLC_PDU_TYPE_IS_I(pdu) &&
+               if (LLC_PDU_TYPE_IS_I(pdu) &&
                    !(skb->dev->flags & IFF_LOOPBACK)) {
                        struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
 

diff --git a/net/llc/llc_evnt.c b/net/llc/llc_evnt.c
index 654650f5a4f5242d03b2bcaed383b414a1b77def..3ff47997522d9ab0caa1259a16a13e37699ed168 100644 (file)
--- a/net/llc/llc_evnt.c
+++ b/net/llc/llc_evnt.c
@@ -68,8 +68,8 @@ int llc_stat_ev_rx_null_dsap_xid_c(struct llc_station *station,
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
        return ev->type == LLC_STATION_EV_TYPE_PDU &&
-              !LLC_PDU_IS_CMD(pdu) &&                  /* command PDU */
-              !LLC_PDU_TYPE_IS_U(pdu) &&               /* U type PDU */
+              LLC_PDU_IS_CMD(pdu) &&                   /* command PDU */
+              LLC_PDU_TYPE_IS_U(pdu) &&                /* U type PDU */
               LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_XID &&
               !pdu->dsap ? 0 : 1;                      /* NULL DSAP value */
 }
@@ -81,8 +81,8 @@ int llc_stat_ev_rx_null_dsap_0_xid_r_xid_r_cnt_eq(struct llc_station *station,
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
        return ev->type == LLC_STATION_EV_TYPE_PDU &&
-              !LLC_PDU_IS_RSP(pdu) &&                  /* response PDU */
-              !LLC_PDU_TYPE_IS_U(pdu) &&               /* U type PDU */
+              LLC_PDU_IS_RSP(pdu) &&                   /* response PDU */
+              LLC_PDU_TYPE_IS_U(pdu) &&                /* U type PDU */
               LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
               !pdu->dsap &&                            /* NULL DSAP value */
               !station->xid_r_count ? 0 : 1;
@@ -95,8 +95,8 @@ int llc_stat_ev_rx_null_dsap_1_xid_r_xid_r_cnt_eq(struct llc_station *station,
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
        return ev->type == LLC_STATION_EV_TYPE_PDU &&
-              !LLC_PDU_IS_RSP(pdu) &&                  /* response PDU */
-              !LLC_PDU_TYPE_IS_U(pdu) &&               /* U type PDU */
+              LLC_PDU_IS_RSP(pdu) &&                   /* response PDU */
+              LLC_PDU_TYPE_IS_U(pdu) &&                /* U type PDU */
               LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID &&
               !pdu->dsap &&                            /* NULL DSAP value */
               station->xid_r_count == 1 ? 0 : 1;
@@ -109,8 +109,8 @@ int llc_stat_ev_rx_null_dsap_test_c(struct llc_station *station,
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
        return ev->type == LLC_STATION_EV_TYPE_PDU &&
-              !LLC_PDU_IS_CMD(pdu) &&                  /* command PDU */
-              !LLC_PDU_TYPE_IS_U(pdu) &&               /* U type PDU */
+              LLC_PDU_IS_CMD(pdu) &&                   /* command PDU */
+              LLC_PDU_TYPE_IS_U(pdu) &&                /* U type PDU */
               LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_TEST &&
               !pdu->dsap ? 0 : 1;                      /* NULL DSAP */
 }

diff --git a/net/llc/llc_s_ev.c b/net/llc/llc_s_ev.c
index 949ade2680675045c414e410f6ebc21fb3fa436f..a74d2a1d658135ede739363b66e2b6883865e09b 100644 (file)
--- a/net/llc/llc_s_ev.c
+++ b/net/llc/llc_s_ev.c
@@ -33,8 +33,8 @@ int llc_sap_ev_rx_ui(struct llc_sap *sap, struct sk_buff *skb)
        struct llc_sap_state_ev *ev = llc_sap_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return ev->type == LLC_SAP_EV_TYPE_PDU && !LLC_PDU_IS_CMD(pdu) &&
-              !LLC_PDU_TYPE_IS_U(pdu) &&
+       return ev->type == LLC_SAP_EV_TYPE_PDU && LLC_PDU_IS_CMD(pdu) &&
+              LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_UI ? 0 : 1;
 }
 
@@ -62,8 +62,8 @@ int llc_sap_ev_rx_xid_c(struct llc_sap *sap, struct sk_buff *skb)
        struct llc_sap_state_ev *ev = llc_sap_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return ev->type == LLC_SAP_EV_TYPE_PDU && !LLC_PDU_IS_CMD(pdu) &&
-              !LLC_PDU_TYPE_IS_U(pdu) &&
+       return ev->type == LLC_SAP_EV_TYPE_PDU && LLC_PDU_IS_CMD(pdu) &&
+              LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_XID ? 0 : 1;
 }
 
@@ -72,8 +72,8 @@ int llc_sap_ev_rx_xid_r(struct llc_sap *sap, struct sk_buff *skb)
        struct llc_sap_state_ev *ev = llc_sap_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return ev->type == LLC_SAP_EV_TYPE_PDU && !LLC_PDU_IS_RSP(pdu) &&
-              !LLC_PDU_TYPE_IS_U(pdu) &&
+       return ev->type == LLC_SAP_EV_TYPE_PDU && LLC_PDU_IS_RSP(pdu) &&
+              LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_XID ? 0 : 1;
 }
 
@@ -91,8 +91,8 @@ int llc_sap_ev_rx_test_c(struct llc_sap *sap, struct sk_buff *skb)
        struct llc_sap_state_ev *ev = llc_sap_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return ev->type == LLC_SAP_EV_TYPE_PDU && !LLC_PDU_IS_CMD(pdu) &&
-              !LLC_PDU_TYPE_IS_U(pdu) &&
+       return ev->type == LLC_SAP_EV_TYPE_PDU && LLC_PDU_IS_CMD(pdu) &&
+              LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_CMD(pdu) == LLC_1_PDU_CMD_TEST ? 0 : 1;
 }
 
@@ -101,8 +101,8 @@ int llc_sap_ev_rx_test_r(struct llc_sap *sap, struct sk_buff *skb)
        struct llc_sap_state_ev *ev = llc_sap_ev(skb);
        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
-       return ev->type == LLC_SAP_EV_TYPE_PDU && !LLC_PDU_IS_RSP(pdu) &&
-              !LLC_PDU_TYPE_IS_U(pdu) &&
+       return ev->type == LLC_SAP_EV_TYPE_PDU && LLC_PDU_IS_RSP(pdu) &&
+              LLC_PDU_TYPE_IS_U(pdu) &&
               LLC_U_PDU_RSP(pdu) == LLC_1_PDU_CMD_TEST ? 0 : 1;
 }