diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2018-12-19 04:54:32 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2018-12-19 04:54:32 +0000 |
| commit | 0e4a3d93eefdc9730f572e8277b100eff6cf3491 (patch) | |
| tree | 87d7af926e26dae7081e33140f1ec781fa06876d | |
| parent | 627bd78e3e2e60e0124e82577203acb5c793838f (diff) | |
| download | src-0e4a3d93eefdc9730f572e8277b100eff6cf3491.tar.gz src-0e4a3d93eefdc9730f572e8277b100eff6cf3491.zip | |
Notes
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/conf/kern.mk | 1 | ||||
| -rw-r--r-- | sys/dev/fxp/if_fxp.c | 2 | ||||
| -rw-r--r-- | sys/dev/fxp/if_fxpreg.h | 13 | ||||
| -rw-r--r-- | sys/modules/fxp/Makefile | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/sys/conf/files b/sys/conf/files index 48954bbc3c98..cb3027eb2f99 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 76bfa3e9e67f..398df66f66fd 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -25,7 +25,6 @@ NO_WUNNEEDED_INTERNAL_DECL= -Wno-error-unneeded-internal-declaration 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. diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 2c3297a05bea..1a1fba6fc0dc 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -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 | diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h index d1e6a45a2766..6b5f3d8b40a7 100644 --- a/sys/dev/fxp/if_fxpreg.h +++ b/sys/dev/fxp/if_fxpreg.h @@ -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, diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile index 6a47028f8822..fbe14392f69f 100644 --- a/sys/modules/fxp/Makefile +++ b/sys/modules/fxp/Makefile @@ -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} |