hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac80211: implement .rate_update in minstrel_ht 

SVN-Revision: 20033
lede-17.01
Felix Fietkau 2010-03-07 16:29:33 +00:00
parent c5885e669e
commit e111568b6d
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
package/mac80211/patches/560-minstrel_ht.patch
View File

@ -68,7 +68,7 @@
--- /dev/null --- /dev/null
+++ b/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -0,0 +1,803 @@ @@ -0,0 +1,825 @@
+/* +/*
+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * + *
@ -706,6 +706,39 @@
+ } + }
+} +}
+ +
+static void
+minstrel_ht_update_cap(struct minstrel_ht_sta *mi, struct ieee80211_sta *sta,
+ enum nl80211_channel_type oper_chan_type)
+{
+ struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
+ u16 sta_cap = sta->ht_cap.cap;
+ int i;
+
+ if (oper_chan_type != NL80211_CHAN_HT40MINUS &&
+ oper_chan_type != NL80211_CHAN_HT40PLUS)
+ sta_cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+
+ for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
+ u16 req = 0;
+
+ mi->groups[i].supported = 0;
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) {
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+ req |= IEEE80211_HT_CAP_SGI_40;
+ else
+ req |= IEEE80211_HT_CAP_SGI_20;
+ }
+
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+ req |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+
+ if ((sta_cap & req) != req)
+ continue;
+
+ mi->groups[i].supported =
+ mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
+ }
+}
+ +
+static void +static void
+minstrel_ht_rate_init(void *priv, struct ieee80211_supported_band *sband, +minstrel_ht_rate_init(void *priv, struct ieee80211_supported_band *sband,
@ -714,11 +747,8 @@
+ struct minstrel_priv *mp = priv; + struct minstrel_priv *mp = priv;
+ struct minstrel_ht_sta_priv *msp = priv_sta; + struct minstrel_ht_sta_priv *msp = priv_sta;
+ struct minstrel_ht_sta *mi = &msp->ht; + struct minstrel_ht_sta *mi = &msp->ht;
+ struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
+ struct ieee80211_local *local = hw_to_local(mp->hw); + struct ieee80211_local *local = hw_to_local(mp->hw);
+ int tx_streams;
+ int ack_dur; + int ack_dur;
+ int i;
+ +
+ /* fall back to the old minstrel for legacy stations */ + /* fall back to the old minstrel for legacy stations */
+ if (sta && !sta->ht_cap.ht_supported) { + if (sta && !sta->ht_cap.ht_supported) {
@ -741,28 +771,19 @@
+ mi->overhead_rtscts = mi->overhead + 2 * ack_dur; + mi->overhead_rtscts = mi->overhead + 2 * ack_dur;
+ +
+ mi->avg_ampdu_len = MINSTREL_FRAC(1, 1); + mi->avg_ampdu_len = MINSTREL_FRAC(1, 1);
+ tx_streams = ((mcs->tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK) >>
+ IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT) + 1;
+ +
+ for (i = 0; i < ARRAY_SIZE(mi->groups); i++) { + minstrel_ht_update_cap(mi, sta, mp->hw->conf.channel_type);
+ u16 req = 0; +}
+ +
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) { +static void
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) +minstrel_ht_rate_update(void *priv, struct ieee80211_supported_band *sband,
+ req |= IEEE80211_HT_CAP_SGI_40; + struct ieee80211_sta *sta, void *priv_sta,
+ else + u32 changed, enum nl80211_channel_type oper_chan_type)
+ req |= IEEE80211_HT_CAP_SGI_20; +{
+ } + struct minstrel_ht_sta_priv *msp = priv_sta;
+ struct minstrel_ht_sta *mi = &msp->ht;
+ +
+ if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) + minstrel_ht_update_cap(mi, sta, oper_chan_type);
+ req |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+
+ if ((sta->ht_cap.cap & req) != req)
+ continue;
+
+ mi->groups[i].supported =
+ mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
+ }
+} +}
+ +
+static void * +static void *
@ -829,6 +850,7 @@
+ .tx_status = minstrel_ht_tx_status, + .tx_status = minstrel_ht_tx_status,
+ .get_rate = minstrel_ht_get_rate, + .get_rate = minstrel_ht_get_rate,
+ .rate_init = minstrel_ht_rate_init, + .rate_init = minstrel_ht_rate_init,
+ .rate_update = minstrel_ht_rate_update,
+ .alloc_sta = minstrel_ht_alloc_sta, + .alloc_sta = minstrel_ht_alloc_sta,
+ .free_sta = minstrel_ht_free_sta, + .free_sta = minstrel_ht_free_sta,
+ .alloc = minstrel_ht_alloc, + .alloc = minstrel_ht_alloc,