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>

3 files changed, 11 insertions, 13 deletions

diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index e4de437b7896..8352a4e1cfc9 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -577,10 +577,7 @@ struct b43legacy_wl {
          * at a time. General information about this interface follows.
          */
 
-        /* Opaque ID of the operating interface from the ieee80211
-         * subsystem. Do not modify.
-         */
-        int if_id;
+        struct ieee80211_vif *vif;
         /* MAC address (can be NULL). */
         u8 mac_addr[ETH_ALEN];
         /* Current BSSID (can be NULL). */
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 575fd9a5874d..2d5735ddad8c 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -976,7 +976,7 @@ static void b43legacy_write_probe_resp_plcp(struct b43legacy_wldev *dev,
         plcp.data = 0;
         b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
-                                               dev->wl->if_id,
+                                               dev->wl->vif,
                                                size,
                                                B43legacy_RATE_TO_100KBPS(rate));
         /* Write PLCP in two parts and timing for packet transfer */
@@ -1042,7 +1042,7 @@ static u8 *b43legacy_generate_probe_resp(struct b43legacy_wldev *dev,
         hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                          IEEE80211_STYPE_PROBE_RESP);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
-                                               dev->wl->if_id,
+                                               dev->wl->vif,
                                                *dest_size,
                                                B43legacy_RATE_TO_100KBPS(rate));
         hdr->duration_id = dur;
@@ -2647,7 +2647,7 @@ static void b43legacy_op_configure_filter(struct ieee80211_hw *hw,
 }
 
 static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
-                                         int if_id,
+                                         struct ieee80211_vif *vif,
                                          struct ieee80211_if_conf *conf)
 {
         struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -2658,7 +2658,7 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
                 return -ENODEV;
         mutex_lock(&wl->mutex);
         spin_lock_irqsave(&wl->irq_lock, flags);
-        B43legacy_WARN_ON(wl->if_id != if_id);
+        B43legacy_WARN_ON(wl->vif != vif);
         if (conf->bssid)
                 memcpy(wl->bssid, conf->bssid, ETH_ALEN);
         else
@@ -3177,7 +3177,7 @@ static int b43legacy_op_add_interface(struct ieee80211_hw *hw,
 
         dev = wl->current_dev;
         wl->operating = 1;
-        wl->if_id = conf->if_id;
+        wl->vif = conf->vif;
         wl->if_type = conf->type;
         memcpy(wl->mac_addr, conf->mac_addr, ETH_ALEN);
 
@@ -3205,7 +3205,8 @@ static void b43legacy_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
 
         B43legacy_WARN_ON(!wl->operating);
-        B43legacy_WARN_ON(wl->if_id != conf->if_id);
+        B43legacy_WARN_ON(wl->vif != conf->vif);
+        wl->vif = NULL;
 
         wl->operating = 0;
 
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index fa095d43237f..e20c552442d5 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -223,7 +223,7 @@ static void generate_txhdr_fw3(struct b43legacy_wldev *dev,
         } else {
                 int fbrate_base100kbps = B43legacy_RATE_TO_100KBPS(rate_fb);
                 txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
-                                                         dev->wl->if_id,
+                                                         txctl->vif,
                                                          fragment_len,
                                                          fbrate_base100kbps);
         }
@@ -312,7 +312,7 @@ static void generate_txhdr_fw3(struct b43legacy_wldev *dev,
 
                 if (txctl->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
                         ieee80211_ctstoself_get(dev->wl->hw,
-                                                dev->wl->if_id,
+                                                txctl->vif,
                                                 fragment_data,
                                                 fragment_len, txctl,
                                                 (struct ieee80211_cts *)
@@ -321,7 +321,7 @@ static void generate_txhdr_fw3(struct b43legacy_wldev *dev,
                         len = sizeof(struct ieee80211_cts);
                 } else {
                         ieee80211_rts_get(dev->wl->hw,
-                                          dev->wl->if_id,
+                                          txctl->vif,
                                           fragment_data, fragment_len, txctl,
                                           (struct ieee80211_rts *)
                                           (txhdr->rts_frame));