1 --- a/net/mac80211/cfg.c
2 +++ b/net/mac80211/cfg.c
3 @@ -97,9 +97,6 @@ static int ieee80211_change_iface(struct
7 - if (sdata->vif.type != NL80211_IFTYPE_MONITOR || !flags)
10 if (type == NL80211_IFTYPE_AP_VLAN &&
11 params && params->use_4addr == 0)
12 rcu_assign_pointer(sdata->u.vlan.sta, NULL);
13 @@ -107,7 +104,9 @@ static int ieee80211_change_iface(struct
14 params && params->use_4addr >= 0)
15 sdata->u.mgd.use_4addr = params->use_4addr;
17 - sdata->u.mntr_flags = *flags;
18 + if (sdata->vif.type == NL80211_IFTYPE_MONITOR && flags)
19 + sdata->u.mntr_flags = *flags;