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

Commit ce292a64 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Implement WDS support 



WDS support should be very easy to handle, mac80211 handles
everything for us, so all that is needed is to set the
support flags and handle it in the add_interface() callback.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3f787bd6

drivers/net/wireless/rt2x00/rt2x00config.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, 
	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_WDS:

		conf.sync = TSF_SYNC_BEACON;

		break;

	case NL80211_IFTYPE_STATION:

drivers/net/wireless/rt2x00/rt2x00dev.c

+6 −3
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ static void rt2x00lib_beacondone_iter(void *data, u8 *mac, 


	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_ADHOC &&

	    vif->type != NL80211_IFTYPE_MESH_POINT)

	    vif->type != NL80211_IFTYPE_MESH_POINT &&

	    vif->type != NL80211_IFTYPE_WDS)

		return;



	/*
@@ -782,7 +783,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
		rt2x00dev->hw->wiphy->interface_modes |=

		    BIT(NL80211_IFTYPE_ADHOC) |

		    BIT(NL80211_IFTYPE_AP) |

		    BIT(NL80211_IFTYPE_MESH_POINT);

		    BIT(NL80211_IFTYPE_MESH_POINT) |

		    BIT(NL80211_IFTYPE_WDS);



	/*

	 * Let the driver probe the device to detect the capabilities.
@@ -941,7 +943,8 @@ static void rt2x00lib_resume_intf(void *data, u8 *mac, 
	 */

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MESH_POINT)

	    vif->type == NL80211_IFTYPE_MESH_POINT ||

	    vif->type == NL80211_IFTYPE_WDS)

		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
@@ -227,6 +227,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, 
	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_WDS:

		/*

		 * We don't support mixed combinations of

		 * sta and ap interfaces.