svn commit: r265408 - in head: sys/netinet usr.bin/netstat

[Don Lewis]

On  6 May, Gleb Smirnoff wrote:
> Author: glebius
> Date: Tue May  6 00:00:07 2014
> New Revision: 265408
> URL: http://svnweb.freebsd.org/changeset/base/265408
> 
> Log:
>   - Remove net.inet.tcp.reass.overflows sysctl. It counts exactly
>     same events that tcpstat's tcps_rcvmemdrop counter counts.
>   - Rename tcps_rcvmemdrop to tcps_rcvreassfull and improve its
>     description in netstat(1) output.
>   
>   Sponsored by:	Netflix
>   Sponsored by:	Nginx, Inc.
> 
> Modified:
>   head/sys/netinet/tcp_reass.c
>   head/sys/netinet/tcp_var.h
>   head/usr.bin/netstat/inet.c
> 

 
> Modified: head/sys/netinet/tcp_var.h
> ==============================================================================
> --- head/sys/netinet/tcp_var.h	Mon May  5 23:54:13 2014	(r265407)
> +++ head/sys/netinet/tcp_var.h	Tue May  6 00:00:07 2014	(r265408)
> @@ -426,7 +426,7 @@ struct	tcpstat {
>  	uint64_t tcps_rcvbyte;		/* bytes received in sequence */
>  	uint64_t tcps_rcvbadsum;	/* packets received with ccksum errs */
>  	uint64_t tcps_rcvbadoff;	/* packets received with bad offset */
> -	uint64_t tcps_rcvmemdrop;	/* packets dropped for lack of memory */
> +	uint64_t tcps_rcvreassfull;	/* packets dropped for no reass space */
>  	uint64_t tcps_rcvshort;		/* packets received too short */
>  	uint64_t tcps_rcvduppack;	/* duplicate-only packets received */
>  	uint64_t tcps_rcvdupbyte;	/* duplicate-only bytes received */

This broke emulators/wine:

cc -c -I. -I. -I../../include -I../../include  -D__WINESRC__  -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith -fno-omit-frame-pointer -I/usr/local/include -O2 -pipe -march=athlon64  -fno-strict-aliasing  -o ipstats.o ipstats.c
ipstats.c:1109:92: error: no member named 'tcps_rcvmemdrop' in 'struct tcpstat';
      did you mean 'tcps_listendrop'?
  ...+ tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop +
     tcp_stat.tcps_rcv...
                                          ^~~~~~~~~~~~~~~

I think this needs a __FreeBSD_version 1100020 and/or the addition
of a #define as a compatiblity crutch.