rt2x00: Add per-interface structure

Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.

Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.

Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces

At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.

Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.

The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 52 insertions, 46 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 0a54b651220..6a558bf74f1 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -246,53 +246,53 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 /*
  * Configuration handlers.
  */
-static void rt2500pci_config_mac_addr(struct rt2x00_dev *rt2x00dev,
-                                      __le32 *mac)
-{
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR3, mac,
-                                      (2 * sizeof(__le32)));
-}
-
-static void rt2500pci_config_bssid(struct rt2x00_dev *rt2x00dev,
-                                   __le32 *bssid)
-{
-        rt2x00pci_register_multiwrite(rt2x00dev, CSR5, bssid,
-                                      (2 * sizeof(__le32)));
-}
-
-static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
-                                  const int tsf_sync)
+static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev,
+                                  struct rt2x00_intf *intf,
+                                  struct rt2x00intf_conf *conf,
+                                  const unsigned int flags)
 {
         struct data_queue *queue =
             rt2x00queue_get_queue(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
+        unsigned int bcn_preload;
         u32 reg;
 
-        rt2x00pci_register_write(rt2x00dev, CSR14, 0);
+        if (flags & CONFIG_UPDATE_TYPE) {
+                rt2x00pci_register_write(rt2x00dev, CSR14, 0);
 
-        /*
-         * Enable beacon config
-         */
-        rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
-        rt2x00_set_field32(&reg, BCNCSR1_PRELOAD,
-                           PREAMBLE + get_duration(IEEE80211_HEADER, 20));
-        rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN, queue->cw_min);
-        rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
+                /*
+                 * Enable beacon config
+                 */
+                bcn_preload = PREAMBLE + get_duration(IEEE80211_HEADER, 20);
+                rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
+                rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, bcn_preload);
+                rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN, queue->cw_min);
+                rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
 
-        /*
-         * Enable synchronisation.
-         */
-        rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
-        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-        rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
-        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
-        rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
-        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+                /*
+                 * Enable synchronisation.
+                 */
+                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+                rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+                rt2x00_set_field32(&reg, CSR14_TBCN,
+                                   (conf->sync == TSF_SYNC_BEACON));
+                rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
+                rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
+                rt2x00pci_register_write(rt2x00dev, CSR14, reg);
+        }
+
+        if (flags & CONFIG_UPDATE_MAC)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR3,
+                                              conf->mac, sizeof(conf->mac));
+
+        if (flags & CONFIG_UPDATE_BSSID)
+                rt2x00pci_register_multiwrite(rt2x00dev, CSR5,
+                                              conf->bssid, sizeof(conf->bssid));
 }
 
-static void rt2500pci_config_preamble(struct rt2x00_dev *rt2x00dev,
-                                      const int short_preamble,
-                                      const int ack_timeout,
-                                      const int ack_consume_time)
+static int rt2500pci_config_preamble(struct rt2x00_dev *rt2x00dev,
+                                     const int short_preamble,
+                                     const int ack_timeout,
+                                     const int ack_consume_time)
 {
         int preamble_mask;
         u32 reg;
@@ -330,6 +330,8 @@ static void rt2500pci_config_preamble(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&reg, ARCSR5_SERVICE, 0x84);
         rt2x00_set_field32(&reg, ARCSR2_LENGTH, get_duration(ACK_SIZE, 110));
         rt2x00pci_register_write(rt2x00dev, ARCSR5, reg);
+
+        return 0;
 }
 
 static void rt2500pci_config_phymode(struct rt2x00_dev *rt2x00dev,
@@ -529,8 +531,8 @@ static void rt2500pci_config_duration(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2500pci_config(struct rt2x00_dev *rt2x00dev,
-                             const unsigned int flags,
-                             struct rt2x00lib_conf *libconf)
+                             struct rt2x00lib_conf *libconf,
+                             const unsigned int flags)
 {
         if (flags & CONFIG_UPDATE_PHYMODE)
                 rt2500pci_config_phymode(rt2x00dev, libconf->basic_rates);
@@ -609,9 +611,10 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
         /*
          * To prevent collisions with MAC ASIC on chipsets
          * up to version C the link tuning should halt after 20
-         * seconds.
+         * seconds while being associated.
          */
         if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D &&
+            rt2x00dev->intf_associated &&
             rt2x00dev->link.count > 20)
                 return;
 
@@ -619,9 +622,12 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
 
         /*
          * Chipset versions C and lower should directly continue
-         * to the dynamic CCA tuning.
+         * to the dynamic CCA tuning. Chipset version D and higher
+         * should go straight to dynamic CCA tuning when they
+         * are not associated.
          */
-        if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D)
+        if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D ||
+            !rt2x00dev->intf_associated)
                 goto dynamic_cca_tune;
 
         /*
@@ -1861,9 +1867,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .write_tx_data          = rt2x00pci_write_tx_data,
         .kick_tx_queue          = rt2500pci_kick_tx_queue,
         .fill_rxdone            = rt2500pci_fill_rxdone,
-        .config_mac_addr        = rt2500pci_config_mac_addr,
-        .config_bssid           = rt2500pci_config_bssid,
-        .config_type            = rt2500pci_config_type,
+        .config_intf            = rt2500pci_config_intf,
         .config_preamble        = rt2500pci_config_preamble,
         .config                 = rt2500pci_config,
 };
@@ -1898,6 +1902,8 @@ static const struct data_queue_desc rt2500pci_queue_atim = {
 
 static const struct rt2x00_ops rt2500pci_ops = {
         .name           = KBUILD_MODNAME,
+        .max_sta_intf   = 1,
+        .max_ap_intf    = 1,
         .eeprom_size    = EEPROM_SIZE,
         .rf_size        = RF_SIZE,
         .rx             = &rt2500pci_queue_rx,