svn commit: r349652 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Wed Jul 3 16:48:46 2019 New Revision: 349652 URL: https://svnweb.freebsd.org/changeset/base/349652 Log: MFC r349331: Clean out duplicate definitions of TCP macros also found in netinet/tcp.h. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h == --- stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Wed Jul 3 16:43:40 2019(r349651) +++ stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Wed Jul 3 16:48:46 2019(r349652) @@ -829,37 +829,6 @@ typedefstruct tcpiphdrtcpiphdr_t; #undef IPOPT_AH #defineIPOPT_AH256+IPPROTO_AH -#ifndef TCPOPT_EOL -# define TCPOPT_EOL0 -#endif -#ifndef TCPOPT_NOP -# define TCPOPT_NOP1 -#endif -#ifndef TCPOPT_MAXSEG -# define TCPOPT_MAXSEG 2 -#endif -#ifndef TCPOLEN_MAXSEG -# define TCPOLEN_MAXSEG4 -#endif -#ifndef TCPOPT_WINDOW -# define TCPOPT_WINDOW 3 -#endif -#ifndef TCPOLEN_WINDOW -# define TCPOLEN_WINDOW3 -#endif -#ifndef TCPOPT_SACK_PERMITTED -# define TCPOPT_SACK_PERMITTED 4 -#endif -#ifndef TCPOLEN_SACK_PERMITTED -# define TCPOLEN_SACK_PERMITTED2 -#endif -#ifndef TCPOPT_SACK -# define TCPOPT_SACK 5 -#endif -#ifndef TCPOPT_TIMESTAMP -# define TCPOPT_TIMESTAMP 8 -#endif - #ifndefICMP_MINLEN # define ICMP_MINLEN 8 #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r349652 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Wed Jul 3 16:48:46 2019 New Revision: 349652 URL: https://svnweb.freebsd.org/changeset/base/349652 Log: MFC r349331: Clean out duplicate definitions of TCP macros also found in netinet/tcp.h. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h == --- stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Wed Jul 3 16:43:40 2019(r349651) +++ stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Wed Jul 3 16:48:46 2019(r349652) @@ -828,37 +828,6 @@ typedefstruct tcpiphdrtcpiphdr_t; #undef IPOPT_AH #defineIPOPT_AH256+IPPROTO_AH -#ifndef TCPOPT_EOL -# define TCPOPT_EOL0 -#endif -#ifndef TCPOPT_NOP -# define TCPOPT_NOP1 -#endif -#ifndef TCPOPT_MAXSEG -# define TCPOPT_MAXSEG 2 -#endif -#ifndef TCPOLEN_MAXSEG -# define TCPOLEN_MAXSEG4 -#endif -#ifndef TCPOPT_WINDOW -# define TCPOPT_WINDOW 3 -#endif -#ifndef TCPOLEN_WINDOW -# define TCPOLEN_WINDOW3 -#endif -#ifndef TCPOPT_SACK_PERMITTED -# define TCPOPT_SACK_PERMITTED 4 -#endif -#ifndef TCPOLEN_SACK_PERMITTED -# define TCPOLEN_SACK_PERMITTED2 -#endif -#ifndef TCPOPT_SACK -# define TCPOPT_SACK 5 -#endif -#ifndef TCPOPT_TIMESTAMP -# define TCPOPT_TIMESTAMP 8 -#endif - #ifndefICMP_MINLEN # define ICMP_MINLEN 8 #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
