mac80211: use rate index in TX control
This patch modifies struct ieee80211_tx_control to give band info and the rate index (instead of rate pointers) to drivers. This mostly serves to reduce the TX control structure size to make it fit into skb->cb so that the fragmentation code can put it there and we can think about passing it to drivers that way in the future. The rt2x00 driver update was done by Ivo, thanks. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
36d6825b91
commit
2e92e6f2c5
@ -2406,15 +2406,15 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
|
||||
|
||||
memset(&control, 0, sizeof(control));
|
||||
rate_control_get_rate(dev, sband, skb, &ratesel);
|
||||
if (!ratesel.rate) {
|
||||
if (ratesel.rate_idx < 0) {
|
||||
printk(KERN_DEBUG "%s: Failed to determine TX rate "
|
||||
"for IBSS beacon\n", dev->name);
|
||||
break;
|
||||
}
|
||||
control.vif = &sdata->vif;
|
||||
control.tx_rate = ratesel.rate;
|
||||
control.tx_rate_idx = ratesel.rate_idx;
|
||||
if (sdata->bss_conf.use_short_preamble &&
|
||||
ratesel.rate->flags & IEEE80211_RATE_SHORT_PREAMBLE)
|
||||
sband->bitrates[ratesel.rate_idx].flags & IEEE80211_RATE_SHORT_PREAMBLE)
|
||||
control.flags |= IEEE80211_TXCTL_SHORT_PREAMBLE;
|
||||
control.antenna_sel_tx = local->hw.conf.antenna_sel_tx;
|
||||
control.flags |= IEEE80211_TXCTL_NO_ACK;
|
||||
|
Reference in New Issue
Block a user