History

cfg80211: in bitrate_mask, rename mcs to ht_mcs

Rename NL80211_TXRATE_MCS to NL80211_TXRATE_HT and also rename mcs to ht_mcs in struct cfg80211_bitrate_mask.

Janusz Dziedzic committed 12 years ago

Commit d1e33e61 parent b9243ab6 files · +22 −20Browse files

Unified · Split

6 files
  1. drivers/net/wireless/ath/ath6kl/wmi.c +3 −3
  2. drivers/net/wireless/mwifiex/cfg80211.c +3 −3
  3. include/net/cfg80211.h +1 −1
  4. include/uapi/linux/nl80211.h +4 −2
  5. net/mac80211/cfg.c +2 −2
  6. net/wireless/nl80211.c +9 −9
drivers/net/wireless/ath/ath6kl/wmi.c+3−3
@@ -2754,9 +2754,9 @@ static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx, · 2753 unmodified lines
2754 mask->control[band].legacy << 4;2754 mask->control[band].legacy << 4;
2755 2755
2756 /* copy mcs rate mask */2756 /* copy mcs rate mask */
2757 mcsrate = mask->control[band].mcs[1];2757 mcsrate = mask->control[band].ht_mcs[1];
2758 mcsrate <<= 8;2758 mcsrate <<= 8;
2759 mcsrate |= mask->control[band].mcs[0];2759 mcsrate |= mask->control[band].ht_mcs[0];
2760 ratemask[band] |= mcsrate << 12;2760 ratemask[band] |= mcsrate << 12;
2761 ratemask[band] |= mcsrate << 28;2761 ratemask[band] |= mcsrate << 28;
2762 }2762 }
@@ -2806,7 +2806,7 @@ static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx, · 43 unmodified lines
2806 mask->control[band].legacy << 4;2806 mask->control[band].legacy << 4;
2807 2807
2808 /* copy mcs rate mask */2808 /* copy mcs rate mask */
2809 mcsrate = mask->control[band].mcs[0];2809 mcsrate = mask->control[band].ht_mcs[0];
2810 ratemask[band] |= mcsrate << 12;2810 ratemask[band] |= mcsrate << 12;
2811 ratemask[band] |= mcsrate << 20;2811 ratemask[band] |= mcsrate << 20;
2812 }2812 }
drivers/net/wireless/mwifiex/cfg80211.c+3−3
@@ -1170,10 +1170,10 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy, · 1169 unmodified lines
1170 else1170 else
1171 bitmap_rates[1] = mask->control[band].legacy;1171 bitmap_rates[1] = mask->control[band].legacy;
1172 1172
1173 /* Fill MCS rates */1173 /* Fill HT MCS rates */
1174 bitmap_rates[2] = mask->control[band].mcs[0];1174 bitmap_rates[2] = mask->control[band].ht_mcs[0];
1175 if (priv->adapter->hw_dev_mcs_support == HT_STREAM_2X2)1175 if (priv->adapter->hw_dev_mcs_support == HT_STREAM_2X2)
1176 bitmap_rates[2] |= mask->control[band].mcs[1] << 8;1176 bitmap_rates[2] |= mask->control[band].ht_mcs[1] << 8;
1177 1177
1178 return mwifiex_send_cmd_sync(priv, HostCmd_CMD_TX_RATE_CFG,1178 return mwifiex_send_cmd_sync(priv, HostCmd_CMD_TX_RATE_CFG,
1179 HostCmd_ACT_GEN_SET, 0, bitmap_rates);1179 HostCmd_ACT_GEN_SET, 0, bitmap_rates);
include/net/cfg80211.h+1−1
@@ -1766,7 +1766,7 @@ enum wiphy_params_flags { · 1765 unmodified lines
1766struct cfg80211_bitrate_mask {1766struct cfg80211_bitrate_mask {
1767 struct {1767 struct {
1768 u32 legacy;1768 u32 legacy;
1769 u8 mcs[IEEE80211_HT_MCS_MASK_LEN];1769 u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
1770 } control[IEEE80211_NUM_BANDS];1770 } control[IEEE80211_NUM_BANDS];
1771};1771};
1772/**1772/**
include/uapi/linux/nl80211.h+4−2
@@ -3110,7 +3110,7 @@ enum nl80211_key_attributes { · 3109 unmodified lines
3110 * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with3110 * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
3111 * 1 = 500 kbps) but without the IE length restriction (at most3111 * 1 = 500 kbps) but without the IE length restriction (at most
3112 * %NL80211_MAX_SUPP_RATES in a single array).3112 * %NL80211_MAX_SUPP_RATES in a single array).
3113 * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection3113 * @NL80211_TXRATE_HT: HT (MCS) rates allowed for TX rate selection
3114 * in an array of MCS numbers.3114 * in an array of MCS numbers.
3115 * @__NL80211_TXRATE_AFTER_LAST: internal3115 * @__NL80211_TXRATE_AFTER_LAST: internal
3116 * @NL80211_TXRATE_MAX: highest TX rate attribute3116 * @NL80211_TXRATE_MAX: highest TX rate attribute
@@ -3118,13 +3118,15 @@ enum nl80211_key_attributes { · 1 unmodified line
3118enum nl80211_tx_rate_attributes {3118enum nl80211_tx_rate_attributes {
3119 __NL80211_TXRATE_INVALID,3119 __NL80211_TXRATE_INVALID,
3120 NL80211_TXRATE_LEGACY,3120 NL80211_TXRATE_LEGACY,
3121 NL80211_TXRATE_MCS,3121 NL80211_TXRATE_HT,
3122 3122
3123 /* keep last */3123 /* keep last */
3124 __NL80211_TXRATE_AFTER_LAST,3124 __NL80211_TXRATE_AFTER_LAST,
3125 NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 13125 NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1
3126};3126};
3127 3127
3128#define NL80211_TXRATE_MCS NL80211_TXRATE_HT
3129
3128/**3130/**
3129 * enum nl80211_band - Frequency band3131 * enum nl80211_band - Frequency band
3130 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band3132 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
net/mac80211/cfg.c+2−2
@@ -2588,8 +2588,8 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy, · 2587 unmodified lines
2588 int j;2588 int j;
2589 2589
2590 sdata->rc_rateidx_mask[i] = mask->control[i].legacy;2590 sdata->rc_rateidx_mask[i] = mask->control[i].legacy;
2591 memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,2591 memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].ht_mcs,
2592 sizeof(mask->control[i].mcs));2592 sizeof(mask->control[i].ht_mcs));
2593 2593
2594 sdata->rc_has_mcs_mask[i] = false;2594 sdata->rc_has_mcs_mask[i] = false;
2595 if (!sband)2595 if (!sband)
net/wireless/nl80211.c+9−9
@@ -7312,8 +7312,8 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband, · 7311 unmodified lines
7312static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {7312static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
7313 [NL80211_TXRATE_LEGACY] = { .type = NLA_BINARY,7313 [NL80211_TXRATE_LEGACY] = { .type = NLA_BINARY,
7314 .len = NL80211_MAX_SUPP_RATES },7314 .len = NL80211_MAX_SUPP_RATES },
7315 [NL80211_TXRATE_MCS] = { .type = NLA_BINARY,7315 [NL80211_TXRATE_HT] = { .type = NLA_BINARY,
7316 .len = NL80211_MAX_SUPP_HT_RATES },7316 .len = NL80211_MAX_SUPP_HT_RATES },
7317};7317};
7318 7318
7319static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,7319static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
@@ -7339,9 +7339,9 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb, · 19 unmodified lines
7339 continue;7339 continue;
7340 7340
7341 mask.control[i].legacy = (1 << sband->n_bitrates) - 1;7341 mask.control[i].legacy = (1 << sband->n_bitrates) - 1;
7342 memcpy(mask.control[i].mcs,7342 memcpy(mask.control[i].ht_mcs,
7343 sband->ht_cap.mcs.rx_mask,7343 sband->ht_cap.mcs.rx_mask,
7344 sizeof(mask.control[i].mcs));7344 sizeof(mask.control[i].ht_mcs));
7345 }7345 }
7346 7346
7347 /* if no rates are given set it back to the defaults */7347 /* if no rates are given set it back to the defaults */
@@ -7372,12 +7372,12 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb, · 24 unmodified lines
7372 nla_len(tb[NL80211_TXRATE_LEGACY]))7372 nla_len(tb[NL80211_TXRATE_LEGACY]))
7373 return -EINVAL;7373 return -EINVAL;
7374 }7374 }
7375 if (tb[NL80211_TXRATE_MCS]) {7375 if (tb[NL80211_TXRATE_HT]) {
7376 if (!ht_rateset_to_mask(7376 if (!ht_rateset_to_mask(
7377 sband,7377 sband,
7378 nla_data(tb[NL80211_TXRATE_MCS]),7378 nla_data(tb[NL80211_TXRATE_HT]),
7379 nla_len(tb[NL80211_TXRATE_MCS]),7379 nla_len(tb[NL80211_TXRATE_HT]),
7380 mask.control[band].mcs))7380 mask.control[band].ht_mcs))
7381 return -EINVAL;7381 return -EINVAL;
7382 }7382 }
7383 7383
@@ -7388,7 +7388,7 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb, · 4 unmodified lines
7388 return -EINVAL;7388 return -EINVAL;
7389 7389
7390 for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++)7390 for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++)
7391 if (mask.control[band].mcs[i])7391 if (mask.control[band].ht_mcs[i])
7392 break;7392 break;
7393 7393
7394 /* legacy and mcs rates may not be both empty */7394 /* legacy and mcs rates may not be both empty */