aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-15 18:00:26 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-07-12 06:08:10 -0400
commit84efbb84cf76238faf26facf481c8675859bfaeb (patch)
tree3cc01b479a4c2db70b1b9ed59e1451d93acb5769 /net/mac80211/iface.c
parent71bbc9943883cffaf5d7a7728a4e4c50b3ac44d3 (diff)
cfg80211: use wireless_dev for interface management
In order to be able to create P2P Device wdevs, move the virtual interface management over to wireless_dev structures. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index fbef7a1ada7a..b1edf60fbba7 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1373,7 +1373,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
1373} 1373}
1374 1374
1375int ieee80211_if_add(struct ieee80211_local *local, const char *name, 1375int ieee80211_if_add(struct ieee80211_local *local, const char *name,
1376 struct net_device **new_dev, enum nl80211_iftype type, 1376 struct wireless_dev **new_wdev, enum nl80211_iftype type,
1377 struct vif_params *params) 1377 struct vif_params *params)
1378{ 1378{
1379 struct net_device *ndev; 1379 struct net_device *ndev;
@@ -1463,8 +1463,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
1463 list_add_tail_rcu(&sdata->list, &local->interfaces); 1463 list_add_tail_rcu(&sdata->list, &local->interfaces);
1464 mutex_unlock(&local->iflist_mtx); 1464 mutex_unlock(&local->iflist_mtx);
1465 1465
1466 if (new_dev) 1466 if (new_wdev)
1467 *new_dev = ndev; 1467 *new_wdev = &sdata->wdev;
1468 1468
1469 return 0; 1469 return 0;
1470 1470