Author: glebius
Date: Wed Jan 15 05:48:36 2020
New Revision: 356754
URL: https://svnweb.freebsd.org/changeset/base/356754

Log:
  Use official macro to enter/exit the network epoch. NFC

Modified:
  head/sys/netinet/tcp_ratelimit.c

Modified: head/sys/netinet/tcp_ratelimit.c
==============================================================================
--- head/sys/netinet/tcp_ratelimit.c    Wed Jan 15 05:45:27 2020        
(r356753)
+++ head/sys/netinet/tcp_ratelimit.c    Wed Jan 15 05:48:36 2020        
(r356754)
@@ -880,7 +880,7 @@ rt_setup_rate(struct inpcb *inp, struct ifnet *ifp, ui
        struct epoch_tracker et;
        int err;
 
-       epoch_enter_preempt(net_epoch_preempt, &et);
+       NET_EPOCH_ENTER(et);
 use_real_interface:
        CK_LIST_FOREACH(rs, &int_rs, next) {
                /*
@@ -920,7 +920,7 @@ use_real_interface:
        if ((rs == NULL) || (rs->rs_disable != 0)) {
                if (rs->rs_disable && error)
                        *error = ENOSPC;
-               epoch_exit_preempt(net_epoch_preempt, &et);
+               NET_EPOCH_EXIT(et);
                return (NULL);
        }
        if (rs->rs_flags & RS_IS_DEFF) {
@@ -931,7 +931,7 @@ use_real_interface:
                if (tifp == NULL) {
                        if (rs->rs_disable && error)
                                *error = ENOTSUP;
-                       epoch_exit_preempt(net_epoch_preempt, &et);
+                       NET_EPOCH_EXIT(et);
                        return (NULL);
                }
                goto use_real_interface;
@@ -940,7 +940,7 @@ use_real_interface:
            ((rs->rs_flows_using + 1) > rs->rs_flow_limit)) {
                if (error)
                        *error = ENOSPC;
-               epoch_exit_preempt(net_epoch_preempt, &et);
+               NET_EPOCH_EXIT(et);
                return (NULL);
        }
        rte = tcp_find_suitable_rate(rs, bytes_per_sec, flags);
@@ -964,7 +964,7 @@ use_real_interface:
                 */
                atomic_add_64(&rs->rs_flows_using, 1);
        }
-       epoch_exit_preempt(net_epoch_preempt, &et);
+       NET_EPOCH_EXIT(et);
        return (rte);
 }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to