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, 83 insertions, 30 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 6a25195816db..2363ca4903cc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -343,20 +343,22 @@ static inline int rt2x00_update_ant_rssi(struct link *link, int rssi)
 
 /*
  * Interface structure
- * Configuration details about the current interface.
+ * Per interface configuration details, this structure
+ * is allocated as the private data for ieee80211_vif.
  */
-struct interface {
+struct rt2x00_intf {
         /*
-         * Interface identification. The value is assigned
-         * to us by the 80211 stack, and is used to request
-         * new beacons.
+         * All fields within the rt2x00_intf structure
+         * must be protected with a spinlock.
          */
-        struct ieee80211_vif *id;
+        spinlock_t lock;
 
         /*
-         * Current working type (IEEE80211_IF_TYPE_*).
+         * BSS configuration. Copied from the structure
+         * passed to us through the bss_info_changed()
+         * callback funtion.
          */
-        int type;
+        struct ieee80211_bss_conf conf;
 
         /*
          * MAC of the device.
@@ -367,16 +369,25 @@ struct interface {
          * BBSID of the AP to associate with.
          */
         u8 bssid[ETH_ALEN];
-};
 
-static inline int is_interface_present(struct interface *intf)
-{
-        return !!intf->id;
-}
+        /*
+         * Entry in the beacon queue which belongs to
+         * this interface. Each interface has its own
+         * dedicated beacon entry.
+         */
+        struct queue_entry *beacon;
 
-static inline int is_interface_type(struct interface *intf, int type)
+        /*
+         * Actions that needed rescheduling.
+         */
+        unsigned int delayed_flags;
+#define DELAYED_UPDATE_BEACON           0x00000001
+#define DELAYED_CONFIG_PREAMBLE         0x00000002
+};
+
+static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
 {
-        return intf->type == type;
+        return (struct rt2x00_intf *)vif->drv_priv;
 }
 
 /*
@@ -430,6 +441,37 @@ struct rt2x00lib_conf {
 };
 
 /*
+ * Configuration structure wrapper around the
+ * rt2x00 interface configuration handler.
+ */
+struct rt2x00intf_conf {
+        /*
+         * Interface type
+         */
+        enum ieee80211_if_types type;
+
+        /*
+         * TSF sync value, this is dependant on the operation type.
+         */
+        enum tsf_sync sync;
+
+        /*
+         * The MAC and BSSID addressess are simple array of bytes,
+         * these arrays are little endian, so when sending the addressess
+         * to the drivers, copy the it into a endian-signed variable.
+         *
+         * Note that all devices (except rt2500usb) have 32 bits
+         * register word sizes. This means that whatever variable we
+         * pass _must_ be a multiple of 32 bits. Otherwise the device
+         * might not accept what we are sending to it.
+         * This will also make it easier for the driver to write
+         * the data to the device.
+         */
+        __le32 mac[2];
+        __le32 bssid[2];
+};
+
+/*
  * rt2x00lib callback functions.
  */
 struct rt2x00lib_ops {
@@ -495,16 +537,21 @@ struct rt2x00lib_ops {
         /*
          * Configuration handlers.
          */
-        void (*config_mac_addr) (struct rt2x00_dev *rt2x00dev, __le32 *mac);
-        void (*config_bssid) (struct rt2x00_dev *rt2x00dev, __le32 *bssid);
-        void (*config_type) (struct rt2x00_dev *rt2x00dev, const int type,
-                                                           const int tsf_sync);
-        void (*config_preamble) (struct rt2x00_dev *rt2x00dev,
-                                 const int short_preamble,
-                                 const int ack_timeout,
-                                 const int ack_consume_time);
-        void (*config) (struct rt2x00_dev *rt2x00dev, const unsigned int flags,
-                        struct rt2x00lib_conf *libconf);
+        void (*config_intf) (struct rt2x00_dev *rt2x00dev,
+                             struct rt2x00_intf *intf,
+                             struct rt2x00intf_conf *conf,
+                             const unsigned int flags);
+#define CONFIG_UPDATE_TYPE              ( 1 << 1 )
+#define CONFIG_UPDATE_MAC               ( 1 << 2 )
+#define CONFIG_UPDATE_BSSID             ( 1 << 3 )
+
+        int (*config_preamble) (struct rt2x00_dev *rt2x00dev,
+                                const int short_preamble,
+                                const int ack_timeout,
+                                const int ack_consume_time);
+        void (*config) (struct rt2x00_dev *rt2x00dev,
+                        struct rt2x00lib_conf *libconf,
+                        const unsigned int flags);
 #define CONFIG_UPDATE_PHYMODE           ( 1 << 1 )
 #define CONFIG_UPDATE_CHANNEL           ( 1 << 2 )
 #define CONFIG_UPDATE_TXPOWER           ( 1 << 3 )
@@ -519,6 +566,8 @@ struct rt2x00lib_ops {
  */
 struct rt2x00_ops {
         const char *name;
+        const unsigned int max_sta_intf;
+        const unsigned int max_ap_intf;
         const unsigned int eeprom_size;
         const unsigned int rf_size;
         const struct data_queue_desc *rx;
@@ -550,6 +599,7 @@ enum rt2x00_flags {
         /*
          * Driver features
          */
+        DRIVER_SUPPORT_MIXED_INTERFACES,
         DRIVER_REQUIRE_FIRMWARE,
         DRIVER_REQUIRE_FIRMWARE_CRC_ITU_T,
         DRIVER_REQUIRE_FIRMWARE_CCITT,
@@ -566,7 +616,6 @@ enum rt2x00_flags {
         CONFIG_EXTERNAL_LNA_BG,
         CONFIG_DOUBLE_ANTENNA,
         CONFIG_DISABLE_LINK_TUNING,
-        CONFIG_SHORT_PREAMBLE,
 };
 
 /*
@@ -670,9 +719,14 @@ struct rt2x00_dev {
         unsigned int packet_filter;
 
         /*
-         * Interface configuration.
+         * Interface details:
+         *  - Open ap interface count.
+         *  - Open sta interface count.
+         *  - Association count.
          */
-        struct interface interface;
+        unsigned int intf_ap_count;
+        unsigned int intf_sta_count;
+        unsigned int intf_associated;
 
         /*
          * Link quality
@@ -738,9 +792,8 @@ struct rt2x00_dev {
         /*
          * Scheduled work.
          */
-        struct work_struct beacon_work;
+        struct work_struct intf_work;
         struct work_struct filter_work;
-        struct work_struct config_work;
 
         /*
          * Data queue arrays for RX, TX and Beacon.