net/mlx4_en: Fix mixed PFC and Global pause user control requests

[pandora-kernel.git] / net / llc / llc_c_ev.c

diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c
index d5bdb53..523fdd1 100644 (file)
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -37,6 +37,7 @@
 #include <net/llc_conn.h>
 #include <net/llc_sap.h>
 #include <net/sock.h>
+#include <net/llc_c_ac.h>
 #include <net/llc_c_ev.h>
 #include <net/llc_pdu.h>
 
@@ -46,8 +47,6 @@
 #define dprintk(args...)
 #endif
 
-extern u16 llc_circular_between(u8 a, u8 b, u8 c);
-
 /**
  *     llc_util_ns_inside_rx_window - check if sequence number is in rx window
  *     @ns: sequence number of received pdu.
@@ -99,7 +98,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 +106,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 +114,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 +122,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 +130,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 +138,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 +151,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 +159,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 +167,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 +175,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 +185,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 +196,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 +208,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,20 +220,21 @@ 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",
-                       __FUNCTION__, llc_sk(sk)->state, ns, vr);
+                       __func__, llc_sk(sk)->state, ns, vr);
        return rc;
 }
 
 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 +244,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 +253,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 +263,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 +275,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 +287,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,20 +298,21 @@ 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",
-                       __FUNCTION__, llc_sk(sk)->state, ns, vr);
+                       __func__, llc_sk(sk)->state, ns, vr);
        return rc;
 }
 
 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 +321,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 +330,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 +339,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 +348,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 +356,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 +365,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 +374,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 +383,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 +392,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 +401,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 +410,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 +420,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 +430,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 +447,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 +462,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))
@@ -477,32 +478,10 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
        return rc;
 }
 
-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))
-                               rc = 0;
-               } 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))
-                                       rc = 0;
-                               break;
-                       }
-       }
-       return rc;
-}
-
 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,15 +503,15 @@ 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)) &&
            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);
+                       __func__, llc_sk(sk)->state, vs, nr);
                rc = 0;
        }
        return rc;
@@ -542,16 +521,16 @@ 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)) &&
            nr != vs && llc_util_nr_inside_tx_window(sk, nr)) {
                rc = 0;
                dprintk("%s: matched, state=%d, vs=%d, nr=%d\n",
-                       __FUNCTION__, llc_sk(sk)->state, vs, nr);
+                       __func__, llc_sk(sk)->state, vs, nr);
        }
        return rc;
 }
@@ -563,28 +542,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 +575,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;