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 c5deda2..523fdd1 100644 (file)
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -228,7 +228,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
                 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;
 }
 
@@ -306,7 +306,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
                 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;
 }
 
@@ -511,7 +511,7 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
            (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;
@@ -530,7 +530,7 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
            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;
 }