Page MenuHomeFreeBSD
Files F109855007

D7065.diff
No OneTemporary
Actions

D7065.diff
View Options

Index: sys/netinet/tcp_hostcache.h
===================================================================
--- sys/netinet/tcp_hostcache.h
+++ sys/netinet/tcp_hostcache.h
@@ -57,7 +57,7 @@
uint32_t rmx_ssthresh; /* outbound gateway buffer limit */
uint32_t rmx_rtt; /* estimated round trip time */
uint32_t rmx_rttvar; /* estimated rtt variance */
- u_long rmx_cwnd; /* congestion window */
+ uint32_t rmx_cwnd; /* congestion window */
u_long rmx_sendpipe; /* outbound delay-bandwidth product */
u_long rmx_recvpipe; /* inbound delay-bandwidth product */
/* TCP hostcache internal data */
Index: sys/netinet/tcp_hostcache.c
===================================================================
--- sys/netinet/tcp_hostcache.c
+++ sys/netinet/tcp_hostcache.c
@@ -558,8 +558,8 @@
if (hc_entry->rmx_cwnd == 0)
hc_entry->rmx_cwnd = hcml->rmx_cwnd;
else
- hc_entry->rmx_cwnd =
- (hc_entry->rmx_cwnd + hcml->rmx_cwnd) / 2;
+ hc_entry->rmx_cwnd = ((uint64_t)hc_entry->rmx_cwnd +
+ (uint64_t)hcml->rmx_cwnd) / 2;
/* TCPSTAT_INC(tcps_cachedcwnd); */
}
if (hcml->rmx_sendpipe != 0) {
@@ -612,7 +612,7 @@
TAILQ_FOREACH(hc_entry, &V_tcp_hostcache.hashbase[i].hch_bucket,
rmx_q) {
sbuf_printf(&sb,
- "%-15s %5u %8u %6lums %6lums %8lu %8lu %8lu %4lu "
+ "%-15s %5u %8u %6lums %6lums %8u %8lu %8lu %4lu "
"%4lu %4i\n",
hc_entry->ip4.s_addr ? inet_ntoa(hc_entry->ip4) :
#ifdef INET6
Index: sys/netinet/tcp_var.h
===================================================================
--- sys/netinet/tcp_var.h
+++ sys/netinet/tcp_var.h
@@ -406,7 +406,7 @@
uint32_t rmx_ssthresh; /* outbound gateway buffer limit */
uint32_t rmx_rtt; /* estimated round trip time */
uint32_t rmx_rttvar; /* estimated rtt variance */
- u_long rmx_cwnd; /* congestion window */
+ uint32_t rmx_cwnd; /* congestion window */
u_long rmx_sendpipe; /* outbound delay-bandwidth product */
u_long rmx_recvpipe; /* inbound delay-bandwidth product */
};

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 9:35 AM (11 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16592718
Default Alt Text
D7065.diff (1 KB)

Event Timeline