Page MenuHomeFreeBSD
Files F152737030

D18603.diff
No OneTemporary
Actions

D18603.diff
View Options

Index: head/sys/conf/files
===================================================================
--- head/sys/conf/files
+++ head/sys/conf/files
@@ -1782,8 +1782,7 @@
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
Index: head/sys/conf/kern.mk
===================================================================
--- head/sys/conf/kern.mk
+++ head/sys/conf/kern.mk
@@ -25,7 +25,6 @@
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.
Index: head/sys/dev/fxp/if_fxp.c
===================================================================
--- head/sys/dev/fxp/if_fxp.c
+++ head/sys/dev/fxp/if_fxp.c
@@ -1627,7 +1627,7 @@
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 |
Index: head/sys/dev/fxp/if_fxpreg.h
===================================================================
--- head/sys/dev/fxp/if_fxpreg.h
+++ head/sys/dev/fxp/if_fxpreg.h
@@ -281,10 +281,15 @@
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,
Index: head/sys/modules/fxp/Makefile
===================================================================
--- head/sys/modules/fxp/Makefile
+++ head/sys/modules/fxp/Makefile
@@ -6,5 +6,3 @@
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}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 17, 7:30 PM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31676517
Default Alt Text
D18603.diff (2 KB)

Event Timeline