3 files changed, 12 insertions, 17 deletions

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index fbb374c65945..c96d1a81cf42 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1161,9 +1161,8 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                 break;
 
         case SCTP_DISPOSITION_VIOLATION:
-                if (net_ratelimit())
-                        pr_err("protocol violation state %d chunkid %d\n",
-                               state, subtype.chunk);
+                net_err_ratelimited("protocol violation state %d chunkid %d\n",
+                                    state, subtype.chunk);
                 break;
 
         case SCTP_DISPOSITION_NOT_IMPL:
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index a147b4d307d2..9fca10357350 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1129,17 +1129,15 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
         /* This should never happen, but lets log it if so.  */
         if (unlikely(!link)) {
                 if (from_addr.sa.sa_family == AF_INET6) {
-                        if (net_ratelimit())
-                                pr_warn("%s association %p could not find address %pI6\n",
-                                        __func__,
-                                        asoc,
-                                        &from_addr.v6.sin6_addr);
+                        net_warn_ratelimited("%s association %p could not find address %pI6\n",
+                                             __func__,
+                                             asoc,
+                                             &from_addr.v6.sin6_addr);
                 } else {
-                        if (net_ratelimit())
-                                pr_warn("%s association %p could not find address %pI4\n",
-                                        __func__,
-                                        asoc,
-                                        &from_addr.v4.sin_addr.s_addr);
+                        net_warn_ratelimited("%s association %p could not find address %pI4\n",
+                                             __func__,
+                                             asoc,
+                                             &from_addr.v4.sin_addr.s_addr);
                 }
                 return SCTP_DISPOSITION_DISCARD;
         }
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 92ba71dfe080..b3b8a8d813eb 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5840,10 +5840,8 @@ SCTP_STATIC int sctp_listen_start(struct sock *sk, int backlog)
         if (!sctp_sk(sk)->hmac && sctp_hmac_alg) {
                 tfm = crypto_alloc_hash(sctp_hmac_alg, 0, CRYPTO_ALG_ASYNC);
                 if (IS_ERR(tfm)) {
-                        if (net_ratelimit()) {
-                                pr_info("failed to load transform for %s: %ld\n",
-                                        sctp_hmac_alg, PTR_ERR(tfm));
-                        }
+                        net_info_ratelimited("failed to load transform for %s: %ld\n",
+                                             sctp_hmac_alg, PTR_ERR(tfm));
                         return -ENOSYS;
                 }
                 sctp_sk(sk)->hmac = tfm;