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

Commit 7a725f73 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: warn on some invalid vlan operations 



These should never happen, but better warn about them than
crashing a driver, the fact that they never happen is rather
subtle throughout mac80211.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0d143fe1

net/mac80211/main.c

+6 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed) 
	if (WARN_ON(!netif_running(sdata->dev)))

		return 0;



	if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN))

		return -EINVAL;



	if (!local->ops->config_interface)

		return 0;
@@ -321,6 +324,9 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_local *local = sdata->local;



	if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN))

		return;



	if (!changed)

		return;