mac80211: dont use interface indices in drivers

This patch gets rid of the if_id stuff where possible in favour of
a new per-virtual-interface structure "struct ieee80211_vif". This
structure is located at the end of the per-interface structure and
contains a variable length driver-use data area.

This has two advantages:
 * removes the need to look up interfaces by if_id, this is better
   for working with network namespaces and performance
 * allows drivers to store and retrieve per-interface data without
   having to allocate own lists/hash tables

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 21 insertions, 6 deletions

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 1257c7aab2a5..32e241764725 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -177,9 +177,16 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
         list_add(&sta->list, &local->sta_list);
         local->num_sta++;
         sta_info_hash_add(local, sta);
-        if (local->ops->sta_notify)
-                local->ops->sta_notify(local_to_hw(local), dev->ifindex,
-                                        STA_NOTIFY_ADD, addr);
+        if (local->ops->sta_notify) {
+                struct ieee80211_sub_if_data *sdata;
+
+                sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+                if (sdata->type == IEEE80211_IF_TYPE_VLAN)
+                        sdata = sdata->u.vlan.ap;
+
+                local->ops->sta_notify(local_to_hw(local), &sdata->vif,
+                                       STA_NOTIFY_ADD, addr);
+        }
         write_unlock_bh(&local->sta_lock);
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
@@ -247,9 +254,17 @@ void sta_info_free(struct sta_info *sta)
         ieee80211_key_free(sta->key);
         sta->key = NULL;
 
-        if (local->ops->sta_notify)
-                local->ops->sta_notify(local_to_hw(local), sta->dev->ifindex,
-                                        STA_NOTIFY_REMOVE, sta->addr);
+        if (local->ops->sta_notify) {
+                struct ieee80211_sub_if_data *sdata;
+
+                sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+
+                if (sdata->type == IEEE80211_IF_TYPE_VLAN)
+                        sdata = sdata->u.vlan.ap;
+
+                local->ops->sta_notify(local_to_hw(local), &sdata->vif,
+                                       STA_NOTIFY_REMOVE, sta->addr);
+        }
 
         rate_control_remove_sta_debugfs(sta);
         ieee80211_sta_debugfs_remove(sta);