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

Commit a07dbea2 authored by Andrey Yurovsky's avatar Andrey Yurovsky Committed by John W. Linville
Browse files

rt2x00: Add mesh support 



This adds initial support for Mesh Point mode.  For this we tell mac80211 that
we support NL80211_IFTYPE_MESH_POINT.  We also need to send beacons.  mac80211
will configure our RX filter accordingly.

Signed-off-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5352ff65

drivers/net/wireless/rt2x00/rt2x00config.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, 
	switch (type) {

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

		conf.sync = TSF_SYNC_BEACON;

		break;

	case NL80211_IFTYPE_STATION:

drivers/net/wireless/rt2x00/rt2x00dev.c

+7 −4
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ static void rt2x00lib_beacondone_iter(void *data, u8 *mac, 
	struct rt2x00_intf *intf = vif_to_intf(vif);



	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_ADHOC)

	    vif->type != NL80211_IFTYPE_ADHOC &&

	    vif->type != NL80211_IFTYPE_MESH_POINT)

		return;



	/*
@@ -780,7 +781,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	if (rt2x00dev->ops->bcn->entry_num > 0)

		rt2x00dev->hw->wiphy->interface_modes |=

		    BIT(NL80211_IFTYPE_ADHOC) |

		    BIT(NL80211_IFTYPE_AP);

		    BIT(NL80211_IFTYPE_AP) |

		    BIT(NL80211_IFTYPE_MESH_POINT);



	/*

	 * Let the driver probe the device to detect the capabilities.
@@ -935,10 +937,11 @@ static void rt2x00lib_resume_intf(void *data, u8 *mac, 




	/*

	 * Master or Ad-hoc mode require a new beacon update.

	 * AP, Ad-hoc, and Mesh Point mode require a new beacon update.

	 */

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC)

	    vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MESH_POINT)

		intf->delayed_flags |= DELAYED_UPDATE_BEACON;



	spin_unlock(&intf->lock);

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, 
		break;

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_MESH_POINT:

		/*

		 * We don't support mixed combinations of

		 * sta and ap interfaces.