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

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

mt76: mt7615: enable support for mesh 



Enable NL80211_IFTYPE_MESH_POINT and update its path.

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

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

+6 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ static const struct ieee80211_iface_limit if_limits[] = { 
	{

		.max = MT7615_MAX_INTERFACES,

		.types = BIT(NL80211_IFTYPE_AP) |

#ifdef CONFIG_MAC80211_MESH

			 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

			 BIT(NL80211_IFTYPE_STATION)

	}

};
@@ -195,6 +198,9 @@ int mt7615_register_device(struct mt7615_dev *dev) 
	dev->mt76.antenna_mask = 0xf;



	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

#ifdef CONFIG_MAC80211_MESH

				 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

				 BIT(NL80211_IFTYPE_AP);



	ret = mt76_register_device(&dev->mt76, true, mt7615_rates,

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int get_omac_idx(enum nl80211_iftype type, u32 mask) 


	switch (type) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

		/* ap use hw bssid 0 and ext bssid */

		if (~mask & BIT(HW_BSSID_0))

			return HW_BSSID_0;

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

+3 −1
Original line number Diff line number Diff line
@@ -754,6 +754,7 @@ int mt7615_mcu_set_bss_info(struct mt7615_dev *dev, 


	switch (vif->type) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

		tx_wlan_idx = mvif->sta.wcid.idx;

		conn_type = CONNECTION_INFRA_AP;

		break;
@@ -968,7 +969,7 @@ int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif, 
		.rx_wtbl = {

			.tag = cpu_to_le16(WTBL_RX),

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

			.rca1 = vif->type != NL80211_IFTYPE_AP,

			.rca1 = vif->type == NL80211_IFTYPE_STATION,

			.rca2 = 1,

			.rv = 1,

		},
@@ -1042,6 +1043,7 @@ static void sta_rec_convert_vif_type(enum nl80211_iftype type, u32 *conn_type) 
{

	switch (type) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

		if (conn_type)

			*conn_type = CONNECTION_INFRA_STA;

		break;

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

+0 −6
Original line number Diff line number Diff line
@@ -106,25 +106,19 @@ enum { 
#define STA_TYPE_STA		BIT(0)

#define STA_TYPE_AP		BIT(1)

#define STA_TYPE_ADHOC		BIT(2)

#define STA_TYPE_TDLS		BIT(3)

#define STA_TYPE_WDS		BIT(4)

#define STA_TYPE_BC		BIT(5)



#define NETWORK_INFRA		BIT(16)

#define NETWORK_P2P		BIT(17)

#define NETWORK_IBSS		BIT(18)

#define NETWORK_MESH		BIT(19)

#define NETWORK_BOW		BIT(20)

#define NETWORK_WDS		BIT(21)



#define CONNECTION_INFRA_STA	(STA_TYPE_STA | NETWORK_INFRA)

#define CONNECTION_INFRA_AP	(STA_TYPE_AP | NETWORK_INFRA)

#define CONNECTION_P2P_GC	(STA_TYPE_STA | NETWORK_P2P)

#define CONNECTION_P2P_GO	(STA_TYPE_AP | NETWORK_P2P)

#define CONNECTION_MESH_STA	(STA_TYPE_STA | NETWORK_MESH)

#define CONNECTION_MESH_AP	(STA_TYPE_AP | NETWORK_MESH)

#define CONNECTION_IBSS_ADHOC	(STA_TYPE_ADHOC | NETWORK_IBSS)

#define CONNECTION_TDLS		(STA_TYPE_STA | NETWORK_INFRA | STA_TYPE_TDLS)

#define CONNECTION_WDS		(STA_TYPE_WDS | NETWORK_WDS)

#define CONNECTION_INFRA_BC	(STA_TYPE_BC | NETWORK_INFRA)