mac80211: add support for setting the ad-hoc multicast rate

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index af7e84199e6279277d9193a0485aa29c9ebda301..1248369a7c301cfbcd73e6b81c1af314b93a3349 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -205,6 +205,7 @@ enum ieee80211_bss_change {
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *     index into the rate table configured by the driver in
  *     the current band.
+ * @mcast_rate: multicast rate for AP and Ad-Hoc (in 100 kbps)
  * @bssid: The BSSID for this BSS
  * @enable_beacon: whether beaconing should be enabled or not
  * @channel_type: Channel type for this BSS -- the hardware might be
@@ -244,6 +245,7 @@ struct ieee80211_bss_conf {
        u16 assoc_capability;
        u64 timestamp;
        u32 basic_rates;
+       u32 mcast_rate;
        u16 ht_operation_mode;
        s32 cqm_rssi_thold;
        u32 cqm_rssi_hyst;
@@ -2663,7 +2665,7 @@ enum rate_control_changed {
  * @rate_idx_mask: user-requested rate mask (not MCS for now)
  * @skb: the skb that will be transmitted, the control information in it needs
  *     to be filled in
- * @ap: whether this frame is sent out in AP mode
+ * @bss: whether this frame is sent out in AP or IBSS mode
  */
 struct ieee80211_tx_rate_control {
        struct ieee80211_hw *hw;
@@ -2674,7 +2676,7 @@ struct ieee80211_tx_rate_control {
        bool rts, short_preamble;
        u8 max_rate_idx;
        u32 rate_idx_mask;
-       bool ap;
+       bool bss;
 };
 
 struct rate_control_ops {

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 239c4836a946601f27c69f965ae1a0935e71b434..6fe6837dc134459bbc5dc11eade69f475632495a 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -915,6 +915,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 
        sdata->u.ibss.privacy = params->privacy;
        sdata->u.ibss.basic_rates = params->basic_rates;
+       sdata->vif.bss_conf.mcast_rate = params->mcast_rate;
 
        sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 33f76993da081fcd73c10cad2bf1328c46d83299..76de4f8d932716fbd8bc75f038b469d7c822a381 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -211,10 +211,20 @@ static bool rc_no_data_or_no_ack(struct ieee80211_tx_rate_control *txrc)
        return (info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc);
 }
 
-static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
+static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u32 mcast_rate,
+                                 struct ieee80211_supported_band *sband)
 {
        u8 i;
 
+       if (mcast_rate) {
+               for (i = 0; i < sband->n_bitrates; i++) {
+                       if (sband->bitrates[i].bitrate == mcast_rate) {
+                               *idx = i;
+                               return;
+                       }
+               }
+       }
+
        if (basic_rates == 0)
                return; /* assume basic rates unknown and accept rate */
        if (*idx < 0)
@@ -222,7 +232,7 @@ static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
        if (basic_rates & (1 << *idx))
                return; /* selected rate is a basic rate */
 
-       for (i = *idx + 1; i <= max_rate_idx; i++) {
+       for (i = *idx + 1; i <= sband->n_bitrates; i++) {
                if (basic_rates & (1 << i)) {
                        *idx = i;
                        return;
@@ -243,10 +253,11 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
                info->control.rates[0].count =
                        (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
                        1 : txrc->hw->max_rate_tries;
-               if (!sta && txrc->ap)
+               if (!sta && txrc->bss)
                        rc_send_low_broadcast(&info->control.rates[0].idx,
                                              txrc->bss_conf->basic_rates,
-                                             txrc->sband->n_bitrates);
+                                             txrc->bss_conf->mcast_rate,
+                                             txrc->sband);
                return true;
        }
        return false;

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b392876af7d87d2f3cc075ad7dbfd2f97346dda8..e69483647f33c03f9958dfaa60d3d7c1e276dd9a 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -622,7 +622,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                txrc.max_rate_idx = -1;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
-       txrc.ap = tx->sdata->vif.type == NL80211_IFTYPE_AP;
+       txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
+                   tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
 
        /* set up RTS protection if desired */
        if (len > tx->local->hw.wiphy->rts_threshold) {
@@ -2308,7 +2309,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                txrc.max_rate_idx = -1;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
-       txrc.ap = true;
+       txrc.bss = true;
        rate_control_get_rate(sdata, NULL, &txrc);
 
        info->control.vif = vif;