diff options
Diffstat (limited to 'net/mac80211/ieee80211_rate.c')
-rw-r--r-- | net/mac80211/ieee80211_rate.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c index 5676a26a7c75..b957e67c5fba 100644 --- a/net/mac80211/ieee80211_rate.c +++ b/net/mac80211/ieee80211_rate.c | |||
@@ -168,29 +168,13 @@ void rate_control_get_rate(struct net_device *dev, | |||
168 | { | 168 | { |
169 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 169 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
170 | struct rate_control_ref *ref = local->rate_ctrl; | 170 | struct rate_control_ref *ref = local->rate_ctrl; |
171 | struct ieee80211_sub_if_data *sdata; | ||
172 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 171 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
173 | struct sta_info *sta = sta_info_get(local, hdr->addr1); | 172 | struct sta_info *sta = sta_info_get(local, hdr->addr1); |
174 | int i; | 173 | int i; |
175 | u16 fc; | ||
176 | 174 | ||
177 | memset(sel, 0, sizeof(struct rate_selection)); | 175 | memset(sel, 0, sizeof(struct rate_selection)); |
178 | 176 | ||
179 | /* Send management frames and broadcast/multicast data using lowest | 177 | ref->ops->get_rate(ref->priv, dev, mode, skb, sel); |
180 | * rate. */ | ||
181 | fc = le16_to_cpu(hdr->frame_control); | ||
182 | if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || | ||
183 | is_multicast_ether_addr(hdr->addr1)) | ||
184 | sel->rate = rate_lowest(local, mode, sta); | ||
185 | |||
186 | /* If a forced rate is in effect, select it. */ | ||
187 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
188 | if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) | ||
189 | sel->rate = &mode->rates[sdata->bss->force_unicast_rateidx]; | ||
190 | |||
191 | /* If we haven't found the rate yet, ask the rate control algo. */ | ||
192 | if (!sel->rate) | ||
193 | ref->ops->get_rate(ref->priv, dev, mode, skb, sel); | ||
194 | 178 | ||
195 | /* Select a non-ERP backup rate. */ | 179 | /* Select a non-ERP backup rate. */ |
196 | if (!sel->nonerp) { | 180 | if (!sel->nonerp) { |