OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: fix warnings in ieee80211_if_config 

The last warning can never trigger, and the explicit AP_VLAN
check is pointless if we move the config_interface check down,
in practice config_interface is required anyway.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-03-13 11:19:45 +01:00 committed by John W. Linville
parent cee075a24e
commit b5bde374f0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/mac80211/main.c
View File

@ -161,12 +161,6 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
if (WARN_ON(!netif_running(sdata->dev))) if (WARN_ON(!netif_running(sdata->dev)))
return 0; return 0;
if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
return -EINVAL;
if (!local->ops->config_interface)
return 0;
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
if (sdata->vif.type == NL80211_IFTYPE_STATION) if (sdata->vif.type == NL80211_IFTYPE_STATION)
@ -183,6 +177,9 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
return -EINVAL; return -EINVAL;
} }
if (!local->ops->config_interface)
return 0;
switch (sdata->vif.type) { switch (sdata->vif.type) {
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
@ -224,9 +221,6 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
} }
} }
if (WARN_ON(!conf.bssid && (changed & IEEE80211_IFCC_BSSID)))
return -EINVAL;
conf.changed = changed; conf.changed = changed;
return local->ops->config_interface(local_to_hw(local), return local->ops->config_interface(local_to_hw(local),