Re: git: 89f6eb0a61cb - main - tcp: restrict the contents of tcp_timer.h to the kernel context

[Charlie Li]

Michael Tuexen wrote:

     tcp: restrict the contents of tcp_timer.h to the kernel context

     Sponsored by:           Netflix, Inc.
     Differential Revision:  https://reviews.freebsd.org/D50912
---
  sys/netinet/tcp_timer.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 875f1584988c..a145782ba82d 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -32,6 +32,8 @@
  #ifndef _NETINET_TCP_TIMER_H_
  #define _NETINET_TCP_TIMER_H_

+
  /*
   * The TCPT_REXMT timer is used to force retransmissions.
   * The TCP has the TCPT_REXMT timer set whenever segments
@@ -133,8 +135,6 @@
                (tv) = (tvmax); \
  } while(0)

-
  #define       TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : 
tcp_keepinit)
  #define       TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : 
tcp_keepidle)
  #define       TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : 
tcp_keepintvl)

The header file contains only stuff relevant in the kernel context. Reviewed by: glebius, rscheff, Peter Lei, imp +#ifdef _KERNEL -#ifdef _KERNEL

This broke net-mgmt/net-snmp, which uses at least TCPTV_MIN and TCPTV_REXMTMAX.

--
Charlie Li
...nope, still don't have an exit line.

OpenPGP_signature.asc
Description: OpenPGP digital signature