summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2014-01-07 23:50:02 +0000
committertuexen <tuexen@FreeBSD.org>2014-01-07 23:50:02 +0000
commit624cda0839e8304fdd1091289e62b9caab51b889 (patch)
tree2983740f17a356218079f3a8f801bf1b69586588 /sys/netinet
parent16f467cacd9531b98ef3bdb9c5aebd852492b946 (diff)
downloadFreeBSD-src-624cda0839e8304fdd1091289e62b9caab51b889.zip
FreeBSD-src-624cda0839e8304fdd1091289e62b9caab51b889.tar.gz
MFC r259943:
Address some warnings which showed up on the userland version.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/sctp_usrreq.c2
-rw-r--r--sys/netinet/sctputil.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 0ff166c..761ef28 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -2788,7 +2788,7 @@ flags_out:
if (stcb) {
/* simply copy out the sockaddr_storage... */
- int len;
+ size_t len;
len = *optsize;
if (len > stcb->asoc.primary_destination->ro._l_addr.sa.sa_len)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 567bf1c..4ce988e 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -5868,8 +5868,8 @@ get_more_data:
goto release;
}
if ((uio->uio_resid == 0) ||
- ((in_eeor_mode) && (copied_so_far >= max(so->so_rcv.sb_lowat, 1)))
- ) {
+ ((in_eeor_mode) &&
+ (copied_so_far >= (uint32_t) max(so->so_rcv.sb_lowat, 1)))) {
goto release;
}
/*
OpenPOWER on IntegriCloud