Commit f4f4089e authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mcu_update_arp_filter in mt76_connac module 



Move mt76_connac_mcu_update_arp_filter in mt76_connac module since the
code is shared between mt7615 and mt7921

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 36751885

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+7 −2
Original line number Diff line number Diff line
@@ -578,8 +578,13 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_PS)

		mt76_connac_mcu_set_vif_ps(&dev->mt76, vif);



	if (changed & BSS_CHANGED_ARP_FILTER)

		mt7615_mcu_update_arp_filter(hw, vif, info);

	if ((changed & BSS_CHANGED_ARP_FILTER) &&

	    mt7615_firmware_offload(dev)) {

		struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;



		mt76_connac_mcu_update_arp_filter(&dev->mt76, &mvif->mt76,

						  info);

	}



	if (changed & BSS_CHANGED_ASSOC)

		mt7615_mac_set_beacon_filter(phy, vif, info->assoc);

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+0 −47
Original line number Diff line number Diff line
@@ -2704,53 +2704,6 @@ int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
				 sizeof(req), false);

}



int mt7615_mcu_update_arp_filter(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *info)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	struct mt7615_dev *dev = mt7615_hw_dev(hw);

	struct sk_buff *skb;

	int i, len = min_t(int, info->arp_addr_cnt,

			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);

	struct {

		struct {

			u8 bss_idx;

			u8 pad[3];

		} __packed hdr;

		struct mt76_connac_arpns_tlv arp;

	} req_hdr = {

		.hdr = {

			.bss_idx = mvif->mt76.idx,

		},

		.arp = {

			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ARP),

			.len = cpu_to_le16(sizeof(struct mt76_connac_arpns_tlv)),

			.ips_num = len,

			.mode = 2,  /* update */

			.option = 1,

		},

	};



	if (!mt7615_firmware_offload(dev))

		return 0;



	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL,

				 sizeof(req_hdr) + len * sizeof(__be32));

	if (!skb)

		return -ENOMEM;



	skb_put_data(skb, &req_hdr, sizeof(req_hdr));

	for (i = 0; i < len; i++) {

		u8 *addr = (u8 *)skb_put(skb, sizeof(__be32));



		memcpy(addr, &info->arp_addr_list[i], sizeof(__be32));

	}



	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_UNI_CMD_OFFLOAD,

				     true);

}



int mt7615_mcu_set_p2p_oppps(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

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

+0 −3
Original line number Diff line number Diff line
@@ -549,9 +549,6 @@ int mt7615_mac_set_beacon_filter(struct mt7615_phy *phy, 
				 bool enable);

int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,

			  bool enable);

int mt7615_mcu_update_arp_filter(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *info);

int __mt7663_load_firmware(struct mt7615_dev *dev);

u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset);

void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);

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

+42 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,48 @@ int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy) 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rate_txpower);



int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,

				      struct mt76_vif *vif,

				      struct ieee80211_bss_conf *info)

{

	struct sk_buff *skb;

	int i, len = min_t(int, info->arp_addr_cnt,

			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);

	struct {

		struct {

			u8 bss_idx;

			u8 pad[3];

		} __packed hdr;

		struct mt76_connac_arpns_tlv arp;

	} req_hdr = {

		.hdr = {

			.bss_idx = vif->idx,

		},

		.arp = {

			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ARP),

			.len = cpu_to_le16(sizeof(struct mt76_connac_arpns_tlv)),

			.ips_num = len,

			.mode = 2,  /* update */

			.option = 1,

		},

	};



	skb = mt76_mcu_msg_alloc(dev, NULL,

				 sizeof(req_hdr) + len * sizeof(__be32));

	if (!skb)

		return -ENOMEM;



	skb_put_data(skb, &req_hdr, sizeof(req_hdr));

	for (i = 0; i < len; i++) {

		u8 *addr = (u8 *)skb_put(skb, sizeof(__be32));



		memcpy(addr, &info->arp_addr_list[i], sizeof(__be32));

	}



	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_OFFLOAD, true);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_update_arp_filter);



#ifdef CONFIG_PM



const struct wiphy_wowlan_support mt76_connac_wowlan_support = {

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

+3 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,9 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy, 
int mt76_connac_mcu_sched_scan_enable(struct mt76_phy *phy,

				      struct ieee80211_vif *vif,

				      bool enable);

int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,

				      struct mt76_vif *vif,

				      struct ieee80211_bss_conf *info);

int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

				     struct cfg80211_gtk_rekey_data *key);