On 17.10.2011 02:16, Bjoern A. Zeeb wrote:

On 17. Oct 2011, at 00:05 , Bjoern A. Zeeb wrote:

Author: bz
Date: Mon Oct 17 00:05:31 2011
New Revision: 226454
URL: http://svn.freebsd.org/changeset/base/226454

Log:
  Add syntactic sugar missed in r226437 and then not added either when moving
  things around in r226448 but desperately needed to always make things
  compile successfully.



GENRIC and LINT did not fail failed on it as it expanded to:

int tcp_recvspace = 1024*64

followed by:

#define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr)     \
         SYSCTL_INT(parent, nbr, name, access, ptr, val, descr)

=>

#define SYSCTL_INT(parent, nbr, name, access, ptr, val, descr)          \
         SYSCTL_ASSERT_TYPE(INT, ptr, parent, name);                     \
         SYSCTL_OID(parent, nbr, name,                                   \
             CTLTYPE_INT | CTLFLAG_MPSAFE | (access),                    \
             ptr, val, sysctl_handle_int, "I", descr)

and the SYSCTL_ASSERT_TYPE() expanding to nothing in

#define SYSCTL_ASSERT_TYPE(type, ptr, parent, name)

leaving just the ';' around;  so it ended up as:

int tcp_recvspace = 1024*64

;
and an expanded SYSCTL_OID(...);

Oops, sorry missing that one. And thanks for comitting the fix.

--
Andre

  MFC after:    1 week

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c        Sun Oct 16 22:24:04 2011        
(r226453)
+++ head/sys/netinet/tcp_input.c        Mon Oct 17 00:05:31 2011        
(r226454)
@@ -183,7 +183,7 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO,
     &VNET_NAME(tcp_insecure_rst), 0,
     "Follow the old (insecure) criteria for accepting RST packets");

-VNET_DEFINE(int, tcp_recvspace) = 1024*64
+VNET_DEFINE(int, tcp_recvspace) = 1024*64;
#define V_tcp_recvspace VNET(tcp_recvspace)
SYSCTL_VNET_INT(_net_inet_tcp, TCPCTL_RECVSPACE, tcp_recvspace, CTLFLAG_RW,
     &VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size");


_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to