D47862.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47862.diff
View Options

	diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c
	--- a/sys/dev/rtwn/rtl8192c/r92c_tx.c
	+++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c
	@@ -66,8 +66,7 @@
	{
	struct r92c_tx_desc txd = (struct r92c_tx_desc )buf;

	- if (ni->ni_chan != IEEE80211_CHAN_ANYC &&
	- IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
	+ if (ieee80211_ht_check_tx_ht40(ni)) {
	int extc_offset;

	extc_offset = r92c_tx_get_sco(sc, ni->ni_chan);
	diff --git a/sys/dev/rtwn/rtl8812a/r12a_tx.c b/sys/dev/rtwn/rtl8812a/r12a_tx.c
	--- a/sys/dev/rtwn/rtl8812a/r12a_tx.c
	+++ b/sys/dev/rtwn/rtl8812a/r12a_tx.c
	@@ -59,7 +59,7 @@
	static int
	r12a_get_primary_channel(struct rtwn_softc sc, struct ieee80211_channel c)
	{
	- /* XXX 80 MHz */
	+ /* XXX VHT80; VHT40 */
	if (IEEE80211_IS_CHAN_HT40U(c))
	return (R12A_TXDW5_PRIM_CHAN_20_80_2);
	else
	@@ -71,9 +71,8 @@
	{
	struct r12a_tx_desc txd = (struct r12a_tx_desc )buf;

	- /* XXX 80 Mhz */
	- if (ni->ni_chan != IEEE80211_CHAN_ANYC &&
	- IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
	+ /* XXX VHT80; VHT40; VHT20 */
	+ if (ieee80211_ht_check_tx_ht40(ni)) {
	int prim_chan;

	prim_chan = r12a_get_primary_channel(sc, ni->ni_chan);