Module Name: src Committed By: mlelstv Date: Sat Sep 1 09:57:13 UTC 2018
Modified Files: src/sys/dev/usb: if_mue.c Log Message: fix diagnostic build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_mue.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/if_mue.c diff -u src/sys/dev/usb/if_mue.c:1.5 src/sys/dev/usb/if_mue.c:1.6 --- src/sys/dev/usb/if_mue.c:1.5 Fri Aug 31 11:21:00 2018 +++ src/sys/dev/usb/if_mue.c Sat Sep 1 09:57:12 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mue.c,v 1.5 2018/08/31 11:21:00 rin Exp $ */ +/* $NetBSD: if_mue.c,v 1.6 2018/09/01 09:57:12 mlelstv Exp $ */ /* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */ /* @@ -20,7 +20,7 @@ /* Driver for Microchip LAN7500/LAN7800 chipsets. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.5 2018/08/31 11:21:00 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.6 2018/09/01 09:57:12 mlelstv Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1229,8 +1229,8 @@ mue_encap(struct mue_softc *sc, struct m memcpy(c->mue_buf, &hdr, sizeof(hdr)); len = sizeof(hdr); - KASSERTMSG(len + m->m_pkthdr.len <= sc->mue_txbufsz, "%d <= %u", - len + m->m_pkthdr.len, sc->mue_txbufsz); + KASSERTMSG((unsigned)(len + m->m_pkthdr.len) <= sc->mue_txbufsz, + "%d <= %u", len + m->m_pkthdr.len, sc->mue_txbufsz); m_copydata(m, 0, m->m_pkthdr.len, c->mue_buf + len); len += m->m_pkthdr.len; @@ -1284,7 +1284,7 @@ mue_tx_offload(struct mue_softc *sc, str hlen += M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data); else hlen += M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data); - KASSERT(m->m_len >= hlen + sizeof(struct tcphdr)); + KASSERT(m->m_len >= (int)(hlen + sizeof(struct tcphdr))); #endif /* Packet length should be cleared. */