Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src-draft/trunk]: src/sys/dev/pci Disable old ic_fixed_rate code until an al...
details: https://anonhg.NetBSD.org/src-all/rev/8b6b5204273b
branches: trunk
changeset: 951782:8b6b5204273b
user: Nathanial Sloss <nat%netbsd.org@localhost>
date: Fri Sep 04 09:03:13 2020 +1000
description:
Disable old ic_fixed_rate code until an alternative approach is found.
diffstat:
sys/dev/pci/if_iwm.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diffs (69 lines):
diff -r d727cf86f1c7 -r 8b6b5204273b sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c Thu Sep 03 23:23:33 2020 +1000
+++ b/sys/dev/pci/if_iwm.c Fri Sep 04 09:03:13 2020 +1000
@@ -4620,7 +4620,9 @@
iwm_tx_fill_cmd(struct iwm_softc *sc, struct iwm_node *in,
struct ieee80211_frame *wh, struct iwm_tx_cmd *tx)
{
+#ifdef notyet
struct ieee80211com *ic = &sc->sc_ic;
+#endif
struct ieee80211_node *ni = &in->in_ni;
const struct iwm_rate *rinfo;
int type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
@@ -4640,9 +4642,11 @@
} else if (ic->ic_fixed_mcs != -1) {
ridx = sc->sc_fixed_ridx;
#endif
+#ifdef notyet
} else if (ic->ic_fixed_rate != -1) {
ridx = sc->sc_fixed_ridx;
} else {
+#endif
/* for data frames, use RS table */
tx->initial_rate_index = 0;
tx->tx_flags |= htole32(IWM_TX_CMD_FLG_STA_RATE);
@@ -6099,12 +6103,12 @@
int s;
s = splnet();
- if ((ic->ic_fixed_rate == -1
+ if (ic->ic_opmode == IEEE80211_M_STA && vap->iv_bss
#ifndef IEEE80211_NO_HT
|| ic->ic_fixed_mcs == -1
+#else
+ ) {
#endif
- ) &&
- ic->ic_opmode == IEEE80211_M_STA && vap->iv_bss) {
#ifndef IEEE80211_NO_HT
if (ni->ni_flags & IEEE80211_NODE_HT)
otxrate = ni->ni_txmcs;
@@ -6248,9 +6252,11 @@
static int
iwm_media_change(struct ifnet *ifp)
{
+#ifdef notyet
struct iwm_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
uint8_t rate, ridx;
+#endif
int err;
err = ieee80211_media_change(ifp);
@@ -6262,6 +6268,7 @@
sc->sc_fixed_ridx = iwm_mcs2ridx[ic->ic_fixed_mcs];
else
#endif
+#ifdef notyet
if (ic->ic_fixed_rate != -1) {
rate = ic->ic_sup_rates[ic->ic_curmode].
rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL;
@@ -6271,6 +6278,7 @@
break;
sc->sc_fixed_ridx = ridx;
}
+#endif
if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) ==
(IFF_UP | IFF_RUNNING)) {
Home |
Main Index |
Thread Index |
Old Index