svn commit: r342214 - in head/sys: conf dev/fxp modules/fxp
Mark Johnston
markj at FreeBSD.org
Wed Dec 19 04:54:34 UTC 2018
Author: markj
Date: Wed Dec 19 04:54:32 2018
New Revision: 342214
URL: https://svnweb.freebsd.org/changeset/base/342214
Log:
Remove a use of a negative array index from fxp(4).
This fixes a warning seen when compiling amd64 GENERIC with clang 7.
Also remove the workaround added in r337324. clang 7 and gcc 4.2
generate the same code with or without the code change.
Reviewed by: imp (previous version)
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D18603
Modified:
head/sys/conf/files
head/sys/conf/kern.mk
head/sys/dev/fxp/if_fxp.c
head/sys/dev/fxp/if_fxpreg.h
head/sys/modules/fxp/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Dec 19 03:23:23 2018 (r342213)
+++ head/sys/conf/files Wed Dec 19 04:54:32 2018 (r342214)
@@ -1782,8 +1782,7 @@ dev/flash/cqspi.c optional cqspi fdt xdma
dev/flash/mx25l.c optional mx25l
dev/flash/n25q.c optional n25q fdt
dev/flash/qspi_if.m optional cqspi fdt | n25q fdt
-dev/fxp/if_fxp.c optional fxp \
- compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS}"
+dev/fxp/if_fxp.c optional fxp
dev/fxp/inphy.c optional fxp
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk Wed Dec 19 03:23:23 2018 (r342213)
+++ head/sys/conf/kern.mk Wed Dec 19 04:54:32 2018 (r342214)
@@ -25,7 +25,6 @@ NO_WUNNEEDED_INTERNAL_DECL= -Wno-error-unneeded-intern
NO_WSOMETIMES_UNINITIALIZED= -Wno-error-sometimes-uninitialized
NO_WCAST_QUAL= -Wno-error-cast-qual
NO_WTAUTOLOGICAL_POINTER_COMPARE= -Wno-tautological-pointer-compare
-NO_WARRAY_BOUNDS= -Wno-error-array-bounds
# Several other warnings which might be useful in some cases, but not severe
# enough to error out the whole kernel build. Display them anyway, so there is
# some incentive to fix them eventually.
Modified: head/sys/dev/fxp/if_fxp.c
==============================================================================
--- head/sys/dev/fxp/if_fxp.c Wed Dec 19 03:23:23 2018 (r342213)
+++ head/sys/dev/fxp/if_fxp.c Wed Dec 19 04:54:32 2018 (r342214)
@@ -1627,7 +1627,7 @@ fxp_encap(struct fxp_softc *sc, struct mbuf **m_head)
cbp->tbd_number = nseg;
/* Configure TSO. */
if (m->m_pkthdr.csum_flags & CSUM_TSO) {
- cbp->tbd[-1].tb_size = htole32(m->m_pkthdr.tso_segsz << 16);
+ cbp->tbdtso.tb_size = htole32(m->m_pkthdr.tso_segsz << 16);
cbp->tbd[1].tb_size |= htole32(tcp_payload << 16);
cbp->ipcb_ip_schedule |= FXP_IPCB_LARGESEND_ENABLE |
FXP_IPCB_IP_CHECKSUM_ENABLE |
Modified: head/sys/dev/fxp/if_fxpreg.h
==============================================================================
--- head/sys/dev/fxp/if_fxpreg.h Wed Dec 19 03:23:23 2018 (r342213)
+++ head/sys/dev/fxp/if_fxpreg.h Wed Dec 19 04:54:32 2018 (r342214)
@@ -281,10 +281,15 @@ struct fxp_cb_tx {
uint16_t cb_status;
uint16_t cb_command;
uint32_t link_addr;
- uint32_t tbd_array_addr;
- uint16_t byte_count;
- uint8_t tx_threshold;
- uint8_t tbd_number;
+ union {
+ struct {
+ uint32_t tbd_array_addr;
+ uint16_t byte_count;
+ uint8_t tx_threshold;
+ uint8_t tbd_number;
+ };
+ struct fxp_tbd tbdtso;
+ };
/*
* The following structure isn't actually part of the TxCB,
Modified: head/sys/modules/fxp/Makefile
==============================================================================
--- head/sys/modules/fxp/Makefile Wed Dec 19 03:23:23 2018 (r342213)
+++ head/sys/modules/fxp/Makefile Wed Dec 19 04:54:32 2018 (r342214)
@@ -6,5 +6,3 @@ KMOD= if_fxp
SRCS= device_if.h bus_if.h if_fxp.c inphy.c miibus_if.h miidevs.h pci_if.h
.include <bsd.kmod.mk>
-
-CWARNFLAGS+= ${NO_WARRAY_BOUNDS}
More information about the svn-src-all
mailing list