git: ed5e13cfc268 - main - ktls: Fix interaction with RATELIMIT

Andrew Gallatin gallatin at FreeBSD.org
Mon Jun 14 14:51:44 UTC 2021


The branch main has been updated by gallatin:

URL: https://cgit.FreeBSD.org/src/commit/?id=ed5e13cfc2689049ce415dad5057923bc7214a41

commit ed5e13cfc2689049ce415dad5057923bc7214a41
Author:     Andrew Gallatin <gallatin at FreeBSD.org>
AuthorDate: 2021-06-14 14:46:13 +0000
Commit:     Andrew Gallatin <gallatin at FreeBSD.org>
CommitDate: 2021-06-14 14:51:16 +0000

    ktls: Fix interaction with RATELIMIT
    
    uipc_ktls.c was missing opt_ratelimit.h, so it was
    never noticing that RATELIMIT was enabled.  Once it was
    enabled, it failed to compile as  ktls_modify_txrtlmt()
    had accrued a compilation error when it was not being
    compiled in.
    
    Sponsored by: Netflix
---
 sys/kern/uipc_ktls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c
index b0d7ea8016dd..2ab2ef18446b 100644
--- a/sys/kern/uipc_ktls.c
+++ b/sys/kern/uipc_ktls.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ratelimit.h"
 #include "opt_rss.h"
 
 #include <sys/param.h>
@@ -1399,7 +1400,6 @@ ktls_modify_txrtlmt(struct ktls_session *tls, uint64_t max_pacing_rate)
 	};
 	struct m_snd_tag *mst;
 	struct ifnet *ifp;
-	int error;
 
 	/* Can't get to the inp, but it should be locked. */
 	/* INP_LOCK_ASSERT(inp); */


More information about the dev-commits-src-main mailing list