Commit f17f4864 authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: use IEEE80211_OFFLOAD_ENCAP_ENABLED instead of MT_DRV_AMSDU_OFFLOAD 



Drop MT_DRV_AMSDU_OFFLOAD after introducing IEEE80211_OFFLOAD_ENCAP_ENABLED
flag in mac80211. Driver now checks vif->offload_flags to know encap offload
status of each interface.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9aac2969

drivers/net/wireless/mediatek/mt76/mac80211.c

+2 −6
Original line number Diff line number Diff line
@@ -337,12 +337,8 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) 
	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);

	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);

	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);



	if (!(dev->drv->drv_flags & MT_DRV_AMSDU_OFFLOAD)) {

	ieee80211_hw_set(hw, TX_AMSDU);

	ieee80211_hw_set(hw, TX_FRAG_LIST);

	}



	ieee80211_hw_set(hw, MFP_CAPABLE);

	ieee80211_hw_set(hw, AP_LINK_PS);

	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);

drivers/net/wireless/mediatek/mt76/mt76.h

+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ struct mt76_hw_cap { 
#define MT_DRV_SW_RX_AIRTIME		BIT(2)

#define MT_DRV_RX_DMA_HDR		BIT(3)

#define MT_DRV_HW_MGMT_TXQ		BIT(4)

#define MT_DRV_AMSDU_OFFLOAD		BIT(5)



struct mt76_driver_ops {

	u32 drv_flags;

drivers/net/wireless/mediatek/mt76/mt7915/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev, 
	static const struct mt76_driver_ops drv_ops = {

		/* txwi_size = txd size + txp size */

		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7915_txp),

		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |

			     MT_DRV_AMSDU_OFFLOAD,

		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ,

		.survey_flags = SURVEY_INFO_TIME_TX |

				SURVEY_INFO_TIME_RX |

				SURVEY_INFO_TIME_BSS_RX,

drivers/net/wireless/mediatek/mt76/mt7921/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
	static const struct mt76_driver_ops drv_ops = {

		/* txwi_size = txd size + txp size */

		.txwi_size = MT_TXD_SIZE + sizeof(struct mt7921_txp_common),

		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ |

			     MT_DRV_AMSDU_OFFLOAD,

		.drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ,

		.survey_flags = SURVEY_INFO_TIME_TX |

				SURVEY_INFO_TIME_RX |

				SURVEY_INFO_TIME_BSS_RX,