[Glibc-bsd-commits] r2772 - in trunk: glibc-ports/kfreebsd/netinet kfreebsd-kernel-headers/debian kfreebsd-kernel-headers/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2009-09-01 16:31:22 +0000 (Tue, 01 Sep 2009)
New Revision: 2772

Modified:
   trunk/glibc-ports/kfreebsd/netinet/tcp.h
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
Log:
fixes for icecc



Modified: trunk/glibc-ports/kfreebsd/netinet/tcp.h
===================================================================
--- trunk/glibc-ports/kfreebsd/netinet/tcp.h	2009-09-01 07:31:37 UTC (rev 2771)
+++ trunk/glibc-ports/kfreebsd/netinet/tcp.h	2009-09-01 16:31:22 UTC (rev 2772)
@@ -52,6 +52,7 @@
 #define _NETINET_TCP_H	1
 
 #include <features.h>
+#include <sys/queue.h>
 
 /*
  * User-settable options (used with setsockopt).
@@ -64,9 +65,14 @@
 #ifdef __USE_MISC
 # include <sys/types.h>
 
-# ifdef __FAVOR_BSD
 typedef	u_int32_t tcp_seq;
 typedef	u_int32_t tcp_cc;	/* connection count, per RFC 1644 */
+
+/* Miscellaneous constants */
+#define MAX_SACK_BLKS   6       /* Max # SACK blocks stored at receiver side */   
+#define TCP_MAX_SACK    4       /* MAX # SACKs sent in any segment */
+
+# ifdef __FAVOR_BSD
 /*
  * TCP header.
  * Per RFC 793, September, 1981.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2009-09-01 07:31:37 UTC (rev 2771)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2009-09-01 16:31:22 UTC (rev 2772)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.41) UNSTABLE; urgency=low
+
+  * fix <sys/devicestat.h>, needed by icecc
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Aug 2009 14:43:56 +0200
+
 kfreebsd-kernel-headers (0.40) unstable; urgency=low
 
   * Install <sys/kenv.h> at the right location. 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2009-09-01 07:31:37 UTC (rev 2771)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2009-09-01 16:31:22 UTC (rev 2772)
@@ -98,20 +98,13 @@
 ===================================================================
 --- src/sys/sys/devicestat.h.orig
 +++ src/sys/sys/devicestat.h
-@@ -32,7 +32,15 @@
- #define _DEVICESTAT_H
+@@ -33,6 +33,9 @@
  
  #include <sys/queue.h>
--#include <sys/time.h>
-+/* FIXME: this struct is copied from BSDish sys/time.h.  It should be somewhere else. (maybe Glibc?) */
+ #include <sys/time.h>
++#include <sys/_types.h>
++#include <sys/resource.h>
 +#include <stdint.h>
-+#ifndef bintime
-+#define bintime bintime
-+struct bintime {
-+	time_t  sec;
-+	uint64_t frac;
-+};
-+#endif
  
  /*
   * XXX: Should really be SPECNAMELEN