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/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 5a1a790a105b..82bff51d5595 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -625,10 +625,7 @@ struct b43_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;
         /* The MAC address of the operating interface. */
         u8 mac_addr[ETH_ALEN];
         /* Current BSSID */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ea63a9928803..af3d24c559c0 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1169,7 +1169,7 @@ static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
         plcp.data = 0;
         b43_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
         dur = ieee80211_generic_frame_duration(dev->wl->hw,
-                                               dev->wl->if_id, size,
+                                               dev->wl->vif, size,
                                                B43_RATE_TO_BASE100KBPS(rate));
         /* Write PLCP in two parts and timing for packet transfer */
         tmp = le32_to_cpu(plcp.data);
@@ -1226,7 +1226,7 @@ static u8 *b43_generate_probe_resp(struct b43_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, *dest_size,
+                                               dev->wl->vif, *dest_size,
                                                B43_RATE_TO_BASE100KBPS(rate));
         hdr->duration_id = dur;
 
@@ -2928,7 +2928,7 @@ static void b43_op_configure_filter(struct ieee80211_hw *hw,
 }
 
 static int b43_op_config_interface(struct ieee80211_hw *hw,
-                                   int if_id,
+                                   struct ieee80211_vif *vif,
                                    struct ieee80211_if_conf *conf)
 {
         struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -2939,7 +2939,7 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
                 return -ENODEV;
         mutex_lock(&wl->mutex);
         spin_lock_irqsave(&wl->irq_lock, flags);
-        B43_WARN_ON(wl->if_id != if_id);
+        B43_WARN_ON(wl->vif != vif);
         if (conf->bssid)
                 memcpy(wl->bssid, conf->bssid, ETH_ALEN);
         else
@@ -3445,7 +3445,7 @@ static int b43_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);
 
@@ -3473,7 +3473,8 @@ static void b43_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
 
         B43_WARN_ON(!wl->operating);
-        B43_WARN_ON(wl->if_id != conf->if_id);
+        B43_WARN_ON(wl->vif != conf->vif);
+        wl->vif = NULL;
 
         wl->operating = 0;
 
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 419aca1fc4fe..5014213b7752 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -221,7 +221,7 @@ static void generate_txhdr_fw4(struct b43_wldev *dev,
         } else {
                 int fbrate_base100kbps = B43_RATE_TO_BASE100KBPS(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_fw4(struct b43_wldev *dev,
                 rts_rate_fb_ofdm = b43_is_ofdm_rate(rts_rate_fb);
 
                 if (txctl->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
-                        ieee80211_ctstoself_get(dev->wl->hw, dev->wl->if_id,
+                        ieee80211_ctstoself_get(dev->wl->hw, txctl->vif,
                                                 fragment_data, fragment_len,
                                                 txctl,
                                                 (struct ieee80211_cts *)(txhdr->
@@ -320,7 +320,7 @@ static void generate_txhdr_fw4(struct b43_wldev *dev,
                         mac_ctl |= B43_TX4_MAC_SENDCTS;
                         len = sizeof(struct ieee80211_cts);
                 } else {
-                        ieee80211_rts_get(dev->wl->hw, dev->wl->if_id,
+                        ieee80211_rts_get(dev->wl->hw, txctl->vif,
                                           fragment_data, fragment_len, txctl,
                                           (struct ieee80211_rts *)(txhdr->
                                                                    rts_frame));