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

Commit 6ef9e2f6 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

rt2x00: error in configurations with mesh support disabled 



If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising
interface combinations with NL80211_IFTYPE_MESH_POINT present.
Add appropriate ifdefs to avoid running into errors.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e7a4ff7

drivers/net/wireless/rt2x00/rt2x00dev.c

+6 −2
Original line number Diff line number Diff line
@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev) 
	 */

	if_limit = &rt2x00dev->if_limits_ap;

	if_limit->max = rt2x00dev->ops->max_ap_intf;

	if_limit->types = BIT(NL80211_IFTYPE_AP) |

			BIT(NL80211_IFTYPE_MESH_POINT);

	if_limit->types = BIT(NL80211_IFTYPE_AP);

#ifdef CONFIG_MAC80211_MESH

	if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);

#endif



	/*

	 * Build up AP interface combinations structure.
@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
		rt2x00dev->hw->wiphy->interface_modes |=

		    BIT(NL80211_IFTYPE_ADHOC) |

		    BIT(NL80211_IFTYPE_AP) |

#ifdef CONFIG_MAC80211_MESH

		    BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

		    BIT(NL80211_IFTYPE_WDS);



	rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;