diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 31 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwnreg.h | 8 |
2 files changed, 25 insertions, 14 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 23eaf41c022..1291a26973b 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.160 2016/02/04 21:32:01 stsp Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.161 2016/02/05 16:09:19 stsp Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -460,8 +460,7 @@ iwn_attach(struct device *parent, struct device *self, void *aux) ic->ic_htxcaps = 0; ic->ic_txbfcaps = 0; ic->ic_aselcaps = 0; - ic->ic_ampdu_params = IEEE80211_AMPDU_PARAM_SS_4; - + ic->ic_ampdu_params = (IEEE80211_AMPDU_PARAM_SS_4 | 0x3 /* 64k */); #ifdef notyet if (sc->sc_flags & IWN_FLAG_HAS_11N) { /* Set HT capabilities. */ @@ -4940,10 +4939,15 @@ iwn_run(struct iwn_softc *sc) memset(&node, 0, sizeof node); IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr); node.id = IWN_ID_BSS; -#ifdef notyet - node.htflags = htole32(IWN_AMDPU_SIZE_FACTOR(3) | - IWN_AMDPU_DENSITY(5)); /* 2us */ -#endif + if (ni->ni_flags & IEEE80211_NODE_HT) { + node.htmask = (IWN_AMDPU_SIZE_FACTOR_MASK | + IWN_AMDPU_DENSITY_MASK); + node.htflags = htole32( + IWN_AMDPU_SIZE_FACTOR( + (ic->ic_ampdu_params & IEEE80211_AMPDU_PARAM_LE)) | + IWN_AMDPU_DENSITY( + (ic->ic_ampdu_params & IEEE80211_AMPDU_PARAM_SS) >> 2)); + } DPRINTF(("adding BSS node\n")); error = ops->add_node(sc, &node, 1); if (error != 0) { @@ -5090,10 +5094,15 @@ iwn_update_htprot(struct ieee80211com *ic, struct ieee80211_node *ni) memset(&node, 0, sizeof node); IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr); node.id = IWN_ID_BSS; -#ifdef notyet - node.htflags = htole32(IWN_AMDPU_SIZE_FACTOR(3) | - IWN_AMDPU_DENSITY(5)); /* 2us */ -#endif + if (ni->ni_flags & IEEE80211_NODE_HT) { + node.htmask = (IWN_AMDPU_SIZE_FACTOR_MASK | + IWN_AMDPU_DENSITY_MASK); + node.htflags = htole32( + IWN_AMDPU_SIZE_FACTOR( + (ic->ic_ampdu_params & IEEE80211_AMPDU_PARAM_LE)) | + IWN_AMDPU_DENSITY( + (ic->ic_ampdu_params & IEEE80211_AMPDU_PARAM_SS) >> 2)); + } error = ops->add_node(sc, &node, 1); if (error != 0) { printf("%s: could not add BSS node\n", sc->sc_dev.dv_xname); diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 1d9a2bcb8d8..9a4a4fe1bb9 100644 --- a/sys/dev/pci/if_iwnreg.h +++ b/sys/dev/pci/if_iwnreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnreg.h,v 1.51 2016/01/07 23:08:38 stsp Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.52 2016/02/05 16:09:19 stsp Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -605,9 +605,11 @@ struct iwn_node_info { uint32_t htflags; #define IWN_AMDPU_SIZE_FACTOR(x) ((x) << 19) +#define IWN_AMDPU_SIZE_FACTOR_MASK ((0x3) << 19) #define IWN_AMDPU_DENSITY(x) ((x) << 23) +#define IWN_AMDPU_DENSITY_MASK ((0x7) << 23) - uint32_t mask; + uint32_t htmask; uint16_t disable_tid; uint16_t reserved6; uint8_t addba_tid; @@ -632,7 +634,7 @@ struct iwn4965_node_info { uint8_t reserved5; uint8_t key[16]; uint32_t htflags; - uint32_t mask; + uint32_t htmask; uint16_t disable_tid; uint16_t reserved6; uint8_t addba_tid; |