lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: use nl80211 interface types

Browse Source 
There's really no reason for mac80211 to be using its
own interface type defines. Use the nl80211 types and
simplify the configuration code a bit: there's no need
to translate them any more now.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2008-09-11 00:01:58 +02:00
committed by John W. Linville
parent 96dd22ac06
commit 05c914fe33
53 changed files with 517 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net/mac80211/debugfs_netdev.c
View File

@ -345,26 +345,26 @@ static void add_files(struct ieee80211_sub_if_data *sdata)
return;
switch (sdata->vif.type) {
case IEEE80211_IF_TYPE_MESH_POINT:
case NL80211_IFTYPE_MESH_POINT:
#ifdef CONFIG_MAC80211_MESH
add_mesh_stats(sdata);
add_mesh_config(sdata);
#endif
break;
case IEEE80211_IF_TYPE_STA:
case IEEE80211_IF_TYPE_IBSS:
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_ADHOC:
add_sta_files(sdata);
break;
case IEEE80211_IF_TYPE_AP:
case NL80211_IFTYPE_AP:
add_ap_files(sdata);
break;
case IEEE80211_IF_TYPE_WDS:
case NL80211_IFTYPE_WDS:
add_wds_files(sdata);
break;
case IEEE80211_IF_TYPE_MNTR:
case NL80211_IFTYPE_MONITOR:
add_monitor_files(sdata);
break;
case IEEE80211_IF_TYPE_VLAN:
case NL80211_IFTYPE_AP_VLAN:
add_vlan_files(sdata);
break;
default:
@ -482,26 +482,26 @@ static void del_files(struct ieee80211_sub_if_data *sdata)
return;
switch (sdata->vif.type) {
case IEEE80211_IF_TYPE_MESH_POINT:
case NL80211_IFTYPE_MESH_POINT:
#ifdef CONFIG_MAC80211_MESH
del_mesh_stats(sdata);
del_mesh_config(sdata);
#endif
break;
case IEEE80211_IF_TYPE_STA:
case IEEE80211_IF_TYPE_IBSS:
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_ADHOC:
del_sta_files(sdata);
break;
case IEEE80211_IF_TYPE_AP:
case NL80211_IFTYPE_AP:
del_ap_files(sdata);
break;
case IEEE80211_IF_TYPE_WDS:
case NL80211_IFTYPE_WDS:
del_wds_files(sdata);
break;
case IEEE80211_IF_TYPE_MNTR:
case NL80211_IFTYPE_MONITOR:
del_monitor_files(sdata);
break;
case IEEE80211_IF_TYPE_VLAN:
case NL80211_IFTYPE_AP_VLAN:
del_vlan_files(sdata);
break;
default: