Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 870abdf6 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: add multi-rate retry support 



This patch adjusts the rate control API to allow multi-rate retry
if supported by the driver. The ieee80211_hw struct specifies how
many alternate rate selections the driver supports.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 76708dee

drivers/net/wireless/b43/main.c

+1 −0
Original line number Diff line number Diff line
@@ -4588,6 +4588,7 @@ static int b43_wireless_init(struct ssb_device *dev) 
		BIT(NL80211_IFTYPE_ADHOC);



	hw->queues = b43_modparam_qos ? 4 : 1;

	hw->max_altrates = 1;

	SET_IEEE80211_DEV(hw, dev->dev);

	if (is_valid_ether_addr(sprom->et1mac))

		SET_IEEE80211_PERM_ADDR(hw, sprom->et1mac);

drivers/net/wireless/b43/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
	txrate = ieee80211_get_tx_rate(dev->wl->hw, info);

	rate = txrate ? txrate->hw_value : B43_CCK_RATE_1MB;

	rate_ofdm = b43_is_ofdm_rate(rate);

	fbrate = ieee80211_get_alt_retry_rate(dev->wl->hw, info) ? : txrate;

	fbrate = ieee80211_get_alt_retry_rate(dev->wl->hw, info, 0) ? : txrate;

	rate_fb = fbrate->hw_value;

	rate_fb_ofdm = b43_is_ofdm_rate(rate_fb);

drivers/net/wireless/b43legacy/main.c

+1 −0
Original line number Diff line number Diff line
@@ -3710,6 +3710,7 @@ static int b43legacy_wireless_init(struct ssb_device *dev) 
		BIT(NL80211_IFTYPE_WDS) |

		BIT(NL80211_IFTYPE_ADHOC);

	hw->queues = 1; /* FIXME: hardware has more queues */

	hw->max_altrates = 1;

	SET_IEEE80211_DEV(hw, dev->dev);

	if (is_valid_ether_addr(sprom->et1mac))

		SET_IEEE80211_PERM_ADDR(hw, sprom->et1mac);

drivers/net/wireless/b43legacy/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, 


	rate = tx_rate->hw_value;

	rate_ofdm = b43legacy_is_ofdm_rate(rate);

	rate_fb = ieee80211_get_alt_retry_rate(dev->wl->hw, info) ? : tx_rate;

	rate_fb = ieee80211_get_alt_retry_rate(dev->wl->hw, info, 0) ? : tx_rate;

	rate_fb_ofdm = b43legacy_is_ofdm_rate(rate_fb->hw_value);



	txhdr->mac_frame_ctl = wlhdr->frame_control;

drivers/net/wireless/rtl8180_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) 
	entry->plcp_len = cpu_to_le16(plcp_len);

	entry->tx_buf = cpu_to_le32(mapping);

	entry->frame_len = cpu_to_le32(skb->len);

	entry->flags2 = info->control.alt_retry_rate_idx >= 0 ?

		ieee80211_get_alt_retry_rate(dev, info)->bitrate << 4 : 0;

	entry->flags2 = info->control.retries[0].rate_idx >= 0 ?

		ieee80211_get_alt_retry_rate(dev, info, 0)->bitrate << 4 : 0;

	entry->retry_limit = info->control.retry_limit;

	entry->flags = cpu_to_le32(tx_flags);

	__skb_queue_tail(&ring->queue, skb);
@@ -855,6 +855,7 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev, 
	priv = dev->priv;

	priv->pdev = pdev;



	dev->max_altrates = 1;

	SET_IEEE80211_DEV(dev, &pdev->dev);

	pci_set_drvdata(pdev, dev);