svn commit: r335472 - stable/11/sys/compat/ndis

Dimitry Andric dim at FreeBSD.org
Thu Jun 21 09:45:04 UTC 2018


Author: dim
Date: Thu Jun 21 09:45:03 2018
New Revision: 335472
URL: https://svnweb.freebsd.org/changeset/base/335472

Log:
  MFC r335297:
  
  Fix build of ndis with base gcc on i386
  
  Casting from rman_res_t to a pointer results in "cast to pointer from
  integer of different size" warnings with base gcc on i386, so use an
  intermediate cast to uintptr_t to suppress it.  In this case, the I/O
  port range is effectively limited to the range of 0..65535.
  
  Reviewed by:	imp
  Differential Revision: https://reviews.freebsd.org/D15746

Modified:
  stable/11/sys/compat/ndis/subr_ndis.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/ndis/subr_ndis.c
==============================================================================
--- stable/11/sys/compat/ndis/subr_ndis.c	Thu Jun 21 09:41:44 2018	(r335471)
+++ stable/11/sys/compat/ndis/subr_ndis.c	Thu Jun 21 09:45:03 2018	(r335472)
@@ -1285,7 +1285,7 @@ NdisMRegisterIoPortRange(offset, adapter, port, numpor
 	if (rman_get_size(sc->ndis_res_io) < numports)
 		return (NDIS_STATUS_INVALID_LENGTH);
 
-	*offset = (void *)rman_get_start(sc->ndis_res_io);
+	*offset = (void *)(uintptr_t)rman_get_start(sc->ndis_res_io);
 
 	return (NDIS_STATUS_SUCCESS);
 }


More information about the svn-src-all mailing list