net80211: combine iv_vhtcaps and iv_vht_mcsinfo
ClosedPublic
Actions

Authored by bz on Nov 1 2023, 12:11 AM.

Details

Reviewers

adrian
cc

Group Reviewers

wireless

Commits

rG981462ddddb3: net80211: combine iv_vhtcaps and iv_vht_mcsinfo
rGfbba0d6b6364: net80211: combine iv_vhtcaps and iv_vht_mcsinfo

Summary

The iv_vhtcaps and iv_vht_mcsinfo fields together form
struct ieee80211_vht_cap so combine them into one field in the VAP
and keep the information together.

While the structure layout changes no other functional changes intended.

Sponsored by: The FreeBSD Foundation
MFC after: 3 days

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bz created this revision.Nov 1 2023, 12:11 AM

Herald added subscribers: glebius, melifaro, imp. · View Herald TranscriptNov 1 2023, 12:11 AM

bz requested review of this revision.Nov 1 2023, 12:11 AM

Harbormaster completed remote builds in B54228: Diff 129566.Nov 1 2023, 12:11 AM

adrian accepted this revision.Nov 1 2023, 1:08 AM

This revision is now accepted and ready to land.Nov 1 2023, 1:08 AM

cc accepted this revision.Nov 1 2023, 9:07 PM

Closed by commit rGfbba0d6b6364: net80211: combine iv_vhtcaps and iv_vht_mcsinfo (authored by bz). · Explain WhyNov 3 2023, 9:10 PM

This revision was automatically updated to reflect the committed changes.

bz added a commit: rGfbba0d6b6364: net80211: combine iv_vhtcaps and iv_vht_mcsinfo.

bz added a commit: rG981462ddddb3: net80211: combine iv_vhtcaps and iv_vht_mcsinfo.Nov 30 2023, 12:40 AM

Revision Contents
Changeset List

Path

Size

sys/

net80211/

2 lines

2 lines

4 lines

3 lines

50 lines

Diff 129704

View Options

sys/net80211/ieee80211.c

	Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
	PLIST_SUB+= ARCH="${KMK_ARCH}"			PLIST_SUB+= ARCH="${KMK_ARCH}"

	KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}			KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
	KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys			KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
	KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}			KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}

	.include <bsd.port.pre.mk>			.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD			.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	.if ${OSVERSION} >= 1400059			(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
	BROKEN= Fails to compile with libc++ 14.0.3			# llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
	.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000			# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	BROKEN= Fails to compile: error: ran out of registers during register allocation			# and 14 where the llvm 15 is included: PR#265539.
	.endif			# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
	.endif

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
	# clang > 11 included in FreeBSD 14 fails to compile this legacy version
	# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
	# included.
	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}			BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
	CC= clang${VBOX_LLVM_VER}			CC= clang${VBOX_LLVM_VER}
	CXX= clang++${VBOX_LLVM_VER}			CXX= clang++${VBOX_LLVM_VER}
	VBOX_LLVM_VER?= 11			VBOX_LLVM_VER?= 15
	.endif			.endif

	.if ${PYTHON_MAJOR_VER} >= 3			.if ${PYTHON_MAJOR_VER} >= 3
	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \			PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc			PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
	.else			.else
	PLIST_SUB+= PYTHON_PYCDIR=/ \			PLIST_SUB+= PYTHON_PYCDIR=/ \
	PYTHON_PYCEXT=.pyc			PYTHON_PYCEXT=.pyc
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

View Options

sys/net80211/ieee80211_ddb.c

	Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
	PLIST_SUB+= ARCH="${KMK_ARCH}"			PLIST_SUB+= ARCH="${KMK_ARCH}"

	KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}			KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
	KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys			KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
	KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}			KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}

	.include <bsd.port.pre.mk>			.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD			.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	.if ${OSVERSION} >= 1400059			(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
	BROKEN= Fails to compile with libc++ 14.0.3			# llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
	.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000			# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	BROKEN= Fails to compile: error: ran out of registers during register allocation			# and 14 where the llvm 15 is included: PR#265539.
	.endif			# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
	.endif

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
	# clang > 11 included in FreeBSD 14 fails to compile this legacy version
	# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
	# included.
	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}			BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
	CC= clang${VBOX_LLVM_VER}			CC= clang${VBOX_LLVM_VER}
	CXX= clang++${VBOX_LLVM_VER}			CXX= clang++${VBOX_LLVM_VER}
	VBOX_LLVM_VER?= 11			VBOX_LLVM_VER?= 15
	.endif			.endif

	.if ${PYTHON_MAJOR_VER} >= 3			.if ${PYTHON_MAJOR_VER} >= 3
	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \			PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc			PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
	.else			.else
	PLIST_SUB+= PYTHON_PYCDIR=/ \			PLIST_SUB+= PYTHON_PYCDIR=/ \
	PYTHON_PYCEXT=.pyc			PYTHON_PYCEXT=.pyc
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

View Options

sys/net80211/ieee80211_ht.c

	Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
	PLIST_SUB+= ARCH="${KMK_ARCH}"			PLIST_SUB+= ARCH="${KMK_ARCH}"

	KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}			KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
	KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys			KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
	KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}			KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}

	.include <bsd.port.pre.mk>			.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD			.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	.if ${OSVERSION} >= 1400059			(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
	BROKEN= Fails to compile with libc++ 14.0.3			# llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
	.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000			# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	BROKEN= Fails to compile: error: ran out of registers during register allocation			# and 14 where the llvm 15 is included: PR#265539.
	.endif			# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
	.endif

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
	# clang > 11 included in FreeBSD 14 fails to compile this legacy version
	# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
	# included.
	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}			BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
	CC= clang${VBOX_LLVM_VER}			CC= clang${VBOX_LLVM_VER}
	CXX= clang++${VBOX_LLVM_VER}			CXX= clang++${VBOX_LLVM_VER}
	VBOX_LLVM_VER?= 11			VBOX_LLVM_VER?= 15
	.endif			.endif

	.if ${PYTHON_MAJOR_VER} >= 3			.if ${PYTHON_MAJOR_VER} >= 3
	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \			PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc			PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
	.else			.else
	PLIST_SUB+= PYTHON_PYCDIR=/ \			PLIST_SUB+= PYTHON_PYCDIR=/ \
	PYTHON_PYCEXT=.pyc			PYTHON_PYCEXT=.pyc
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

View Options

sys/net80211/ieee80211_var.h

	Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
	PLIST_SUB+= ARCH="${KMK_ARCH}"			PLIST_SUB+= ARCH="${KMK_ARCH}"

	KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}			KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
	KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys			KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
	KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}			KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}

	.include <bsd.port.pre.mk>			.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD			.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	.if ${OSVERSION} >= 1400059			(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
	BROKEN= Fails to compile with libc++ 14.0.3			# llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
	.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000			# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	BROKEN= Fails to compile: error: ran out of registers during register allocation			# and 14 where the llvm 15 is included: PR#265539.
	.endif			# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
	.endif

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
	# clang > 11 included in FreeBSD 14 fails to compile this legacy version
	# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
	# included.
	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}			BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
	CC= clang${VBOX_LLVM_VER}			CC= clang${VBOX_LLVM_VER}
	CXX= clang++${VBOX_LLVM_VER}			CXX= clang++${VBOX_LLVM_VER}
	VBOX_LLVM_VER?= 11			VBOX_LLVM_VER?= 15
	.endif			.endif

	.if ${PYTHON_MAJOR_VER} >= 3			.if ${PYTHON_MAJOR_VER} >= 3
	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \			PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc			PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
	.else			.else
	PLIST_SUB+= PYTHON_PYCDIR=/ \			PLIST_SUB+= PYTHON_PYCDIR=/ \
	PYTHON_PYCEXT=.pyc			PYTHON_PYCEXT=.pyc
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

View Options

sys/net80211/ieee80211_vht.c

net80211: combine iv_vhtcaps and iv_vht_mcsinfoClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 129704

sys/net80211/ieee80211.c

sys/net80211/ieee80211_ddb.c

sys/net80211/ieee80211_ht.c

sys/net80211/ieee80211_var.h

sys/net80211/ieee80211_vht.c

net80211: combine iv_vhtcaps and iv_vht_mcsinfo
ClosedPublic
Actions

Revision Contents
Changeset List