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

Commit 8e621fc9 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: verify IBSS in interface combinations 



Drivers shouldn't attempt to advertise support
for more than one IBSS interface since mac80211
doesn't support that. Check and return an error
from ieee80211_register_hw() in that case.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent df64962f

net/mac80211/main.c

+17 −3
Original line number Diff line number Diff line
@@ -752,11 +752,25 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);

	hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_MONITOR);



	/* mac80211 doesn't support more than 1 channel */

	for (i = 0; i < hw->wiphy->n_iface_combinations; i++)

		if (hw->wiphy->iface_combinations[i].num_different_channels > 1)

	/*

	 * mac80211 doesn't support more than 1 channel, and also not more

	 * than one IBSS interface

	 */

	for (i = 0; i < hw->wiphy->n_iface_combinations; i++) {

		const struct ieee80211_iface_combination *c;

		int j;



		c = &hw->wiphy->iface_combinations[i];



		if (c->num_different_channels > 1)

			return -EINVAL;



		for (j = 0; j < c->n_limits; j++)

			if ((c->limits[j].types & BIT(NL80211_IFTYPE_ADHOC)) &&

			    c->limits[j].max > 1)

				return -EINVAL;

	}



#ifndef CONFIG_MAC80211_MESH

	/* mesh depends on Kconfig, but drivers should set it if they want */

	local->hw.wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MESH_POINT);