Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/poodle.c
	arch/arm/mach-pxa/spitz.c

1 files changed, 270 insertions, 176 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 73d81bc6aa75..b3bd00a9d992 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2002-2005, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
- * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2007-2008  Johannes Berg <johannes@sipsolutions.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -107,7 +107,7 @@ enum ieee80211_max_queues {
  * The information provided in this structure is required for QoS
  * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
  *
- * @aifs: arbitration interface space [0..255]
+ * @aifs: arbitration interframe space [0..255]
  * @cw_min: minimum contention window [a value of the form
  *      2^n-1 in the range 1..32767]
  * @cw_max: maximum contention window [like @cw_min]
@@ -164,6 +164,14 @@ enum ieee80211_bss_change {
 };
 
 /**
+ * struct ieee80211_bss_ht_conf - BSS's changing HT configuration
+ * @operation_mode: HT operation mode (like in &struct ieee80211_ht_info)
+ */
+struct ieee80211_bss_ht_conf {
+        u16 operation_mode;
+};
+
+/**
  * struct ieee80211_bss_conf - holds the BSS's changing parameters
  *
  * This structure keeps information about a BSS (and an association
@@ -172,15 +180,17 @@ enum ieee80211_bss_change {
  * @assoc: association status
  * @aid: association ID number, valid only when @assoc is true
  * @use_cts_prot: use CTS protection
- * @use_short_preamble: use 802.11b short preamble
- * @use_short_slot: use short slot time (only relevant for ERP)
+ * @use_short_preamble: use 802.11b short preamble;
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE hardware flag
+ * @use_short_slot: use short slot time (only relevant for ERP);
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
  * @dtim_period: num of beacons before the next DTIM, for PSM
  * @timestamp: beacon timestamp
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
- * @assoc_ht: association in HT mode
- * @ht_conf: ht capabilities
- * @ht_bss_conf: ht extended capabilities
+ * @ht: BSS's HT configuration
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *      index into the rate table configured by the driver in
  *      the current band.
@@ -198,10 +208,7 @@ struct ieee80211_bss_conf {
         u16 assoc_capability;
         u64 timestamp;
         u64 basic_rates;
-        /* ht related data */
-        bool assoc_ht;
-        struct ieee80211_ht_info *ht_conf;
-        struct ieee80211_ht_bss_info *ht_bss_conf;
+        struct ieee80211_bss_ht_conf ht;
 };
 
 /**
@@ -210,29 +217,24 @@ struct ieee80211_bss_conf {
  * These flags are used with the @flags member of &ieee80211_tx_info.
  *
  * @IEEE80211_TX_CTL_REQ_TX_STATUS: request TX status callback for this frame.
- * @IEEE80211_TX_CTL_USE_RTS_CTS: use RTS-CTS before sending frame
- * @IEEE80211_TX_CTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g.,
- *      for combined 802.11g / 802.11b networks)
+ * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
+ *      number to this frame, taking care of not overwriting the fragment
+ *      number and increasing the sequence number only when the
+ *      IEEE80211_TX_CTL_FIRST_FRAGMENT flag is set. mac80211 will properly
+ *      assign sequence numbers to QoS-data frames but cannot do so correctly
+ *      for non-QoS-data and management frames because beacons need them from
+ *      that counter as well and mac80211 cannot guarantee proper sequencing.
+ *      If this flag is set, the driver should instruct the hardware to
+ *      assign a sequence number to the frame or assign one itself. Cf. IEEE
+ *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
+ *      beacons and always be clear for frames without a sequence number field.
  * @IEEE80211_TX_CTL_NO_ACK: tell the low level not to wait for an ack
- * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: TBD
  * @IEEE80211_TX_CTL_CLEAR_PS_FILT: clear powersave filter for destination
  *      station
- * @IEEE80211_TX_CTL_REQUEUE: TBD
  * @IEEE80211_TX_CTL_FIRST_FRAGMENT: this is a first fragment of the frame
- * @IEEE80211_TX_CTL_SHORT_PREAMBLE: TBD
- * @IEEE80211_TX_CTL_LONG_RETRY_LIMIT: this frame should be send using the
- *      through set_retry_limit configured long retry value
  * @IEEE80211_TX_CTL_SEND_AFTER_DTIM: send this frame after DTIM beacon
  * @IEEE80211_TX_CTL_AMPDU: this frame should be sent as part of an A-MPDU
- * @IEEE80211_TX_CTL_OFDM_HT: this frame can be sent in HT OFDM rates. number
- *      of streams when this flag is on can be extracted from antenna_sel_tx,
- *      so if 1 antenna is marked use SISO, 2 antennas marked use MIMO, n
- *      antennas marked use MIMO_n.
- * @IEEE80211_TX_CTL_GREEN_FIELD: use green field protection for this frame
- * @IEEE80211_TX_CTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width
- * @IEEE80211_TX_CTL_DUP_DATA: duplicate data frame on both 20 Mhz channels
- * @IEEE80211_TX_CTL_SHORT_GI: send this frame using short guard interval
- * @IEEE80211_TX_CTL_INJECTED: TBD
+ * @IEEE80211_TX_CTL_INJECTED: Frame was injected, internal to mac80211.
  * @IEEE80211_TX_STAT_TX_FILTERED: The frame was not transmitted
  *      because the destination STA was in powersave mode.
  * @IEEE80211_TX_STAT_ACK: Frame was acknowledged
@@ -240,63 +242,67 @@ struct ieee80211_bss_conf {
  *      is for the whole aggregation.
  * @IEEE80211_TX_STAT_AMPDU_NO_BACK: no block ack was returned,
  *      so consider using block ack request (BAR).
- * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
- *      number to this frame, taking care of not overwriting the fragment
- *      number and increasing the sequence number only when the
- *      IEEE80211_TX_CTL_FIRST_FRAGMENT flags is set. mac80211 will properly
- *      assign sequence numbers to QoS-data frames but cannot do so correctly
- *      for non-QoS-data and management frames because beacons need them from
- *      that counter as well and mac80211 cannot guarantee proper sequencing.
- *      If this flag is set, the driver should instruct the hardware to
- *      assign a sequence number to the frame or assign one itself. Cf. IEEE
- *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
- *      beacons always be clear for frames without a sequence number field.
+ * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be
+ *      set by rate control algorithms to indicate probe rate, will
+ *      be cleared for fragmented frames (except on the last fragment)
  */
 enum mac80211_tx_control_flags {
         IEEE80211_TX_CTL_REQ_TX_STATUS          = BIT(0),
-        IEEE80211_TX_CTL_USE_RTS_CTS            = BIT(2),
-        IEEE80211_TX_CTL_USE_CTS_PROTECT        = BIT(3),
-        IEEE80211_TX_CTL_NO_ACK                 = BIT(4),
-        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(5),
-        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(6),
-        IEEE80211_TX_CTL_REQUEUE                = BIT(7),
-        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(8),
-        IEEE80211_TX_CTL_SHORT_PREAMBLE         = BIT(9),
-        IEEE80211_TX_CTL_LONG_RETRY_LIMIT       = BIT(10),
-        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(12),
-        IEEE80211_TX_CTL_AMPDU                  = BIT(13),
-        IEEE80211_TX_CTL_OFDM_HT                = BIT(14),
-        IEEE80211_TX_CTL_GREEN_FIELD            = BIT(15),
-        IEEE80211_TX_CTL_40_MHZ_WIDTH           = BIT(16),
-        IEEE80211_TX_CTL_DUP_DATA               = BIT(17),
-        IEEE80211_TX_CTL_SHORT_GI               = BIT(18),
-        IEEE80211_TX_CTL_INJECTED               = BIT(19),
-        IEEE80211_TX_STAT_TX_FILTERED           = BIT(20),
-        IEEE80211_TX_STAT_ACK                   = BIT(21),
-        IEEE80211_TX_STAT_AMPDU                 = BIT(22),
-        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(23),
-        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(24),
+        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(1),
+        IEEE80211_TX_CTL_NO_ACK                 = BIT(2),
+        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(3),
+        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(4),
+        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(5),
+        IEEE80211_TX_CTL_AMPDU                  = BIT(6),
+        IEEE80211_TX_CTL_INJECTED               = BIT(7),
+        IEEE80211_TX_STAT_TX_FILTERED           = BIT(8),
+        IEEE80211_TX_STAT_ACK                   = BIT(9),
+        IEEE80211_TX_STAT_AMPDU                 = BIT(10),
+        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(11),
+        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(12),
+};
+
+enum mac80211_rate_control_flags {
+        IEEE80211_TX_RC_USE_RTS_CTS             = BIT(0),
+        IEEE80211_TX_RC_USE_CTS_PROTECT         = BIT(1),
+        IEEE80211_TX_RC_USE_SHORT_PREAMBLE      = BIT(2),
+
+        /* rate index is an MCS rate number instead of an index */
+        IEEE80211_TX_RC_MCS                     = BIT(3),
+        IEEE80211_TX_RC_GREEN_FIELD             = BIT(4),
+        IEEE80211_TX_RC_40_MHZ_WIDTH            = BIT(5),
+        IEEE80211_TX_RC_DUP_DATA                = BIT(6),
+        IEEE80211_TX_RC_SHORT_GI                = BIT(7),
 };
 
 
-#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE \
-        (sizeof(((struct sk_buff *)0)->cb) - 8)
-#define IEEE80211_TX_INFO_DRIVER_DATA_PTRS \
-        (IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *))
+/* there are 40 bytes if you don't need the rateset to be kept */
+#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40
 
-/* maximum number of alternate rate retry stages */
-#define IEEE80211_TX_MAX_ALTRATE        3
+/* if you do need the rateset, then you have less space */
+#define IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE 24
+
+/* maximum number of rate stages */
+#define IEEE80211_TX_MAX_RATES  5
 
 /**
- * struct ieee80211_tx_altrate - alternate rate selection/status
+ * struct ieee80211_tx_rate - rate selection/status
+ *
+ * @idx: rate index to attempt to send with
+ * @flags: rate control flags (&enum mac80211_rate_control_flags)
+ * @count: number of tries in this rate before going to the next rate
  *
- * @rate_idx: rate index to attempt to send with
- * @limit: number of retries before fallback
+ * A value of -1 for @idx indicates an invalid rate and, if used
+ * in an array of retry rates, that no more rates should be tried.
+ *
+ * When used for transmit status reporting, the driver should
+ * always report the rate along with the flags it used.
  */
-struct ieee80211_tx_altrate {
-        s8 rate_idx;
-        u8 limit;
-};
+struct ieee80211_tx_rate {
+        s8 idx;
+        u8 count;
+        u8 flags;
+} __attribute__((packed));
 
 /**
  * struct ieee80211_tx_info - skb transmit information
@@ -310,15 +316,13 @@ struct ieee80211_tx_altrate {
  * it may be NULL.
  *
  * @flags: transmit info flags, defined above
- * @band: TBD
- * @tx_rate_idx: TBD
- * @antenna_sel_tx: TBD
+ * @band: the band to transmit on (use for checking for races)
+ * @antenna_sel_tx: antenna to use, 0 for automatic diversity
+ * @pad: padding, ignore
  * @control: union for control data
  * @status: union for status data
  * @driver_data: array of driver_data pointers
  * @retry_count: number of retries
- * @excessive_retries: set to 1 if the frame was retried many times
- *      but not acknowledged
  * @ampdu_ack_len: number of aggregated frames.
  *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
  * @ampdu_ack_map: block ack bit map for the aggregation.
@@ -329,31 +333,44 @@ struct ieee80211_tx_info {
         /* common information */
         u32 flags;
         u8 band;
-        s8 tx_rate_idx;
+
         u8 antenna_sel_tx;
 
-        /* 1 byte hole */
+        /* 2 byte hole */
+        u8 pad[2];
 
         union {
                 struct {
+                        union {
+                                /* rate control */
+                                struct {
+                                        struct ieee80211_tx_rate rates[
+                                                IEEE80211_TX_MAX_RATES];
+                                        s8 rts_cts_rate_idx;
+                                };
+                                /* only needed before rate control */
+                                unsigned long jiffies;
+                        };
                         /* NB: vif can be NULL for injected frames */
                         struct ieee80211_vif *vif;
                         struct ieee80211_key_conf *hw_key;
                         struct ieee80211_sta *sta;
-                        unsigned long jiffies;
-                        s8 rts_cts_rate_idx;
-                        u8 retry_limit;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE];
                 } control;
                 struct {
+                        struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
+                        u8 ampdu_ack_len;
                         u64 ampdu_ack_map;
                         int ack_signal;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE + 1];
-                        u8 retry_count;
-                        bool excessive_retries;
-                        u8 ampdu_ack_len;
+                        /* 8 bytes free */
                 } status;
-                void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_PTRS];
+                struct {
+                        struct ieee80211_tx_rate driver_rates[
+                                IEEE80211_TX_MAX_RATES];
+                        void *rate_driver_data[
+                                IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
+                };
+                void *driver_data[
+                        IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)];
         };
 };
 
@@ -362,6 +379,41 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
         return (struct ieee80211_tx_info *)skb->cb;
 }
 
+/**
+ * ieee80211_tx_info_clear_status - clear TX status
+ *
+ * @info: The &struct ieee80211_tx_info to be cleared.
+ *
+ * When the driver passes an skb back to mac80211, it must report
+ * a number of things in TX status. This function clears everything
+ * in the TX status but the rate control information (it does clear
+ * the count since you need to fill that in anyway).
+ *
+ * NOTE: You can only use this function if you do NOT use
+ *       info->driver_data! Use info->rate_driver_data
+ *       instead if you need only the less space that allows.
+ */
+static inline void
+ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
+{
+        int i;
+
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, control.rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, driver_rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) != 8);
+        /* clear the rate counts */
+        for (i = 0; i < IEEE80211_TX_MAX_RATES; i++)
+                info->status.rates[i].count = 0;
+
+        BUILD_BUG_ON(
+            offsetof(struct ieee80211_tx_info, status.ampdu_ack_len) != 23);
+        memset(&info->status.ampdu_ack_len, 0,
+               sizeof(struct ieee80211_tx_info) -
+               offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
+}
+
 
 /**
  * enum mac80211_rx_flags - receive flags
@@ -384,6 +436,9 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
  *      is valid. This is useful in monitor mode and necessary for beacon frames
  *      to enable IBSS merging.
  * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
+ * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
+ * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
+ * @RX_FLAG_SHORT_GI: Short guard interval was used
  */
 enum mac80211_rx_flags {
         RX_FLAG_MMIC_ERROR      = 1<<0,
@@ -394,7 +449,10 @@ enum mac80211_rx_flags {
         RX_FLAG_FAILED_FCS_CRC  = 1<<5,
         RX_FLAG_FAILED_PLCP_CRC = 1<<6,
         RX_FLAG_TSFT            = 1<<7,
-        RX_FLAG_SHORTPRE        = 1<<8
+        RX_FLAG_SHORTPRE        = 1<<8,
+        RX_FLAG_HT              = 1<<9,
+        RX_FLAG_40MHZ           = 1<<10,
+        RX_FLAG_SHORT_GI        = 1<<11,
 };
 
 /**
@@ -414,7 +472,8 @@ enum mac80211_rx_flags {
  * @noise: noise when receiving this frame, in dBm.
  * @qual: overall signal quality indication, in percent (0-100).
  * @antenna: antenna used
- * @rate_idx: index of data rate into band's supported rates
+ * @rate_idx: index of data rate into band's supported rates or MCS index if
+ *      HT rates are use (RX_FLAG_HT)
  * @flag: %RX_FLAG_*
  */
 struct ieee80211_rx_status {
@@ -434,21 +493,49 @@ struct ieee80211_rx_status {
  *
  * Flags to define PHY configuration options
  *
- * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
  * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
- * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
  * @IEEE80211_CONF_PS: Enable 802.11 power save mode
  */
 enum ieee80211_conf_flags {
-        /*
-         * TODO: IEEE80211_CONF_SHORT_SLOT_TIME will be removed once drivers
-         * have been converted to use bss_info_changed() for slot time
-         * configuration
-         */
-        IEEE80211_CONF_SHORT_SLOT_TIME  = (1<<0),
-        IEEE80211_CONF_RADIOTAP         = (1<<1),
-        IEEE80211_CONF_SUPPORT_HT_MODE  = (1<<2),
-        IEEE80211_CONF_PS               = (1<<3),
+        IEEE80211_CONF_RADIOTAP         = (1<<0),
+        IEEE80211_CONF_PS               = (1<<1),
+};
+
+/* XXX: remove all this once drivers stop trying to use it */
+static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
+{
+        return 0;
+}
+#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
+
+struct ieee80211_ht_conf {
+        bool enabled;
+        enum nl80211_channel_type channel_type;
+};
+
+/**
+ * enum ieee80211_conf_changed - denotes which configuration changed
+ *
+ * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed
+ * @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed
+ * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
+ * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
+ * @IEEE80211_CONF_CHANGE_PS: the PS flag changed
+ * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
+ * @IEEE80211_CONF_CHANGE_CHANNEL: the channel changed
+ * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
+ * @IEEE80211_CONF_CHANGE_HT: HT configuration changed
+ */
+enum ieee80211_conf_changed {
+        IEEE80211_CONF_CHANGE_RADIO_ENABLED     = BIT(0),
+        IEEE80211_CONF_CHANGE_BEACON_INTERVAL   = BIT(1),
+        IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
+        IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
+        IEEE80211_CONF_CHANGE_PS                = BIT(4),
+        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
+        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
+        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
+        IEEE80211_CONF_CHANGE_HT                = BIT(8),
 };
 
 /**
@@ -457,34 +544,31 @@ enum ieee80211_conf_flags {
  * This struct indicates how the driver shall configure the hardware.
  *
  * @radio_enabled: when zero, driver is required to switch off the radio.
- *      TODO make a flag
  * @beacon_int: beacon interval (TODO make interface config)
  * @listen_interval: listen interval in units of beacon interval
  * @flags: configuration flags defined above
  * @power_level: requested transmit power (in dBm)
- * @max_antenna_gain: maximum antenna gain (in dBi)
- * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
- *      1/2: antenna 0/1
- * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
- * @ht_conf: describes current self configuration of 802.11n HT capabilies
- * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
  * @channel: the channel to tune to
+ * @ht: the HT configuration for the device
+ * @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
+ *    (a frame not RTS protected), called "dot11LongRetryLimit" in 802.11,
+ *    but actually means the number of transmissions not the number of retries
+ * @short_frame_max_tx_count: Maximum number of transmissions for a "short"
+ *    frame, called "dot11ShortRetryLimit" in 802.11, but actually means the
+ *    number of transmissions not the number of retries
  */
 struct ieee80211_conf {
-        int radio_enabled;
-
         int beacon_int;
-        u16 listen_interval;
         u32 flags;
         int power_level;
-        int max_antenna_gain;
-        u8 antenna_sel_tx;
-        u8 antenna_sel_rx;
 
-        struct ieee80211_channel *channel;
+        u16 listen_interval;
+        bool radio_enabled;
+
+        u8 long_frame_max_tx_count, short_frame_max_tx_count;
 
-        struct ieee80211_ht_info ht_conf;
-        struct ieee80211_ht_bss_info ht_bss_conf;
+        struct ieee80211_channel *channel;
+        struct ieee80211_ht_conf ht;
 };
 
 /**
@@ -494,11 +578,14 @@ struct ieee80211_conf {
  * use during the life of a virtual interface.
  *
  * @type: type of this virtual interface
+ * @bss_conf: BSS configuration for this interface, either our own
+ *      or the BSS we're associated to
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *).
  */
 struct ieee80211_vif {
         enum nl80211_iftype type;
+        struct ieee80211_bss_conf bss_conf;
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -542,14 +629,12 @@ struct ieee80211_if_init_conf {
  * enum ieee80211_if_conf_change - interface config change flags
  *
  * @IEEE80211_IFCC_BSSID: The BSSID changed.
- * @IEEE80211_IFCC_SSID: The SSID changed.
  * @IEEE80211_IFCC_BEACON: The beacon for this interface changed
  *      (currently AP and MESH only), use ieee80211_beacon_get().
  */
 enum ieee80211_if_conf_change {
         IEEE80211_IFCC_BSSID    = BIT(0),
-        IEEE80211_IFCC_SSID     = BIT(1),
-        IEEE80211_IFCC_BEACON   = BIT(2),
+        IEEE80211_IFCC_BEACON   = BIT(1),
 };
 
 /**
@@ -557,11 +642,6 @@ enum ieee80211_if_conf_change {
  *
  * @changed: parameters that have changed, see &enum ieee80211_if_conf_change.
  * @bssid: BSSID of the network we are associated to/creating.
- * @ssid: used (together with @ssid_len) by drivers for hardware that
- *      generate beacons independently. The pointer is valid only during the
- *      config_interface() call, so copy the value somewhere if you need
- *      it.
- * @ssid_len: length of the @ssid field.
  *
  * This structure is passed to the config_interface() callback of
  * &struct ieee80211_hw.
@@ -569,8 +649,6 @@ enum ieee80211_if_conf_change {
 struct ieee80211_if_conf {
         u32 changed;
         u8 *bssid;
-        u8 *ssid;
-        size_t ssid_len;
 };
 
 /**
@@ -677,7 +755,7 @@ enum set_key_cmd {
  * @addr: MAC address
  * @aid: AID we assigned to the station if we're an AP
  * @supp_rates: Bitmap of supported rates (per band)
- * @ht_info: HT capabilities of this STA
+ * @ht_cap: HT capabilities of this STA; restricted to our own TX capabilities
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *), size is determined in hw information.
  */
@@ -685,7 +763,7 @@ struct ieee80211_sta {
         u64 supp_rates[IEEE80211_NUM_BANDS];
         u8 addr[ETH_ALEN];
         u16 aid;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
 
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
@@ -695,13 +773,17 @@ struct ieee80211_sta {
  * enum sta_notify_cmd - sta notify command
  *
  * Used with the sta_notify() callback in &struct ieee80211_ops, this
- * indicates addition and removal of a station to station table.
+ * indicates addition and removal of a station to station table,
+ * or if a associated station made a power state transition.
  *
  * @STA_NOTIFY_ADD: a station was added to the station table
  * @STA_NOTIFY_REMOVE: a station being removed from the station table
+ * @STA_NOTIFY_SLEEP: a station is now sleeping
+ * @STA_NOTIFY_AWAKE: a sleeping station woke up
  */
 enum sta_notify_cmd {
-        STA_NOTIFY_ADD, STA_NOTIFY_REMOVE
+        STA_NOTIFY_ADD, STA_NOTIFY_REMOVE,
+        STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,
 };
 
 /**
@@ -769,6 +851,14 @@ enum ieee80211_tkip_key_type {
  * @IEEE80211_HW_SPECTRUM_MGMT:
  *      Hardware supports spectrum management defined in 802.11h
  *      Measurement, Channel Switch, Quieting, TPC
+ *
+ * @IEEE80211_HW_AMPDU_AGGREGATION:
+ *      Hardware supports 11n A-MPDU aggregation.
+ *
+ * @IEEE80211_HW_NO_STACK_DYNAMIC_PS:
+ *      Hardware which has dynamic power save support, meaning
+ *      that power save is enabled in idle periods, and don't need support
+ *      from stack.
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
@@ -780,6 +870,8 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_SIGNAL_DBM                         = 1<<7,
         IEEE80211_HW_NOISE_DBM                          = 1<<8,
         IEEE80211_HW_SPECTRUM_MGMT                      = 1<<9,
+        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<10,
+        IEEE80211_HW_NO_STACK_DYNAMIC_PS                = 1<<11,
 };
 
 /**
@@ -838,8 +930,8 @@ enum ieee80211_hw_flags {
  * @sta_data_size: size (in bytes) of the drv_priv data area
  *      within &struct ieee80211_sta.
  *
- * @max_altrates: maximum number of alternate rate retry stages
- * @max_altrate_tries: maximum number of tries for each stage
+ * @max_rates: maximum number of alternate rate retry stages
+ * @max_rate_tries: maximum number of tries for each stage
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -856,12 +948,10 @@ struct ieee80211_hw {
         u16 ampdu_queues;
         u16 max_listen_interval;
         s8 max_signal;
-        u8 max_altrates;
-        u8 max_altrate_tries;
+        u8 max_rates;
+        u8 max_rate_tries;
 };
 
-struct ieee80211_hw *wiphy_to_hw(struct wiphy *wiphy);
-
 /**
  * SET_IEEE80211_DEV - set device for 802.11 hardware
  *
@@ -874,7 +964,7 @@ static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev
 }
 
 /**
- * SET_IEEE80211_PERM_ADDR - set the permanenet MAC address for 802.11 hardware
+ * SET_IEEE80211_PERM_ADDR - set the permanent MAC address for 802.11 hardware
  *
  * @hw: the &struct ieee80211_hw to set the MAC address for
  * @addr: the address to set
@@ -898,9 +988,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                       const struct ieee80211_tx_info *c)
 {
-        if (WARN_ON(c->tx_rate_idx < 0))
+        if (WARN_ON(c->control.rates[0].idx < 0))
                 return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->tx_rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[0].idx];
 }
 
 static inline struct ieee80211_rate *
@@ -916,9 +1006,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
                              const struct ieee80211_tx_info *c, int idx)
 {
-        if (c->control.retries[idx].rate_idx < 0)
+        if (c->control.rates[idx + 1].idx < 0)
                 return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->control.retries[idx].rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[idx + 1].idx];
 }
 
 /**
@@ -967,7 +1057,7 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
  * This happens everytime the iv16 wraps around (every 65536 packets). The
  * set_key() call will happen only once for each key (unless the AP did
  * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
- * provided by udpate_tkip_key only. The trigger that makes mac80211 call this
+ * provided by update_tkip_key only. The trigger that makes mac80211 call this
  * handler is software decryption with wrap around of iv16.
  */
 
@@ -1060,12 +1150,14 @@ enum ieee80211_filter_flags {
  * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
  * @IEEE80211_AMPDU_TX_START: start Tx aggregation
  * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
+ * @IEEE80211_AMPDU_TX_RESUME: resume TX aggregation
  */
 enum ieee80211_ampdu_mlme_action {
         IEEE80211_AMPDU_RX_START,
         IEEE80211_AMPDU_RX_STOP,
         IEEE80211_AMPDU_TX_START,
         IEEE80211_AMPDU_TX_STOP,
+        IEEE80211_AMPDU_TX_RESUME,
 };
 
 /**
@@ -1101,7 +1193,7 @@ enum ieee80211_ampdu_mlme_action {
  *      Must be implemented.
  *
  * @add_interface: Called when a netdevice attached to the hardware is
- *      enabled. Because it is not called for monitor mode devices, @open
+ *      enabled. Because it is not called for monitor mode devices, @start
  *      and @stop must be implemented.
  *      The driver should perform any initialization it needs before
  *      the device can be enabled. The initial configuration for the
@@ -1163,14 +1255,9 @@ enum ieee80211_ampdu_mlme_action {
  *
  * @set_rts_threshold: Configuration of RTS threshold (if device needs it)
  *
- * @set_frag_threshold: Configuration of fragmentation threshold. Assign this if
- *      the device does fragmentation by itself; if this method is assigned then
- *      the stack will not do fragmentation.
- *
- * @set_retry_limit: Configuration of retry limits (if device needs it)
- *
- * @sta_notify: Notifies low level driver about addition or removal
- *      of assocaited station or AP.
+ * @sta_notify: Notifies low level driver about addition, removal or power
+ *      state transition of an associated station, AP,  IBSS/WDS/mesh peer etc.
+ *      Must be atomic.
  *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue.
@@ -1194,8 +1281,6 @@ enum ieee80211_ampdu_mlme_action {
  *      This is needed only for IBSS mode and the result of this function is
  *      used to determine whether to reply to Probe Requests.
  *
- * @conf_ht: Configures low level driver with 802.11n HT data. Must be atomic.
- *
  * @ampdu_action: Perform a certain A-MPDU action
  *      The RA/TID combination determines the destination and TID we want
  *      the ampdu action to be performed for. The action is defined through
@@ -1211,7 +1296,7 @@ struct ieee80211_ops {
                              struct ieee80211_if_init_conf *conf);
         void (*remove_interface)(struct ieee80211_hw *hw,
                                  struct ieee80211_if_init_conf *conf);
-        int (*config)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
+        int (*config)(struct ieee80211_hw *hw, u32 changed);
         int (*config_interface)(struct ieee80211_hw *hw,
                                 struct ieee80211_vif *vif,
                                 struct ieee80211_if_conf *conf);
@@ -1237,9 +1322,6 @@ struct ieee80211_ops {
         void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx,
                              u32 *iv32, u16 *iv16);
         int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value);
-        int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
-        int (*set_retry_limit)(struct ieee80211_hw *hw,
-                               u32 short_retry, u32 long_retr);
         void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         enum sta_notify_cmd, struct ieee80211_sta *sta);
         int (*conf_tx)(struct ieee80211_hw *hw, u16 queue,
@@ -1472,7 +1554,7 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
  * the next beacon frame from the 802.11 code. The low-level is responsible
  * for calling this function before beacon data is needed (e.g., based on
  * hardware interrupt). Returned skb is used only once and low-level driver
- * is responsible of freeing it.
+ * is responsible for freeing it.
  */
 struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif);
@@ -1803,24 +1885,38 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
 
 
 /* Rate control API */
+
 /**
- * struct rate_selection - rate information for/from rate control algorithms
- *
- * @rate_idx: selected transmission rate index
- * @nonerp_idx: Non-ERP rate to use instead if ERP cannot be used
- * @probe_idx: rate for probing (or -1)
- * @max_rate_idx: maximum rate index that can be used, this is
- *      input to the algorithm and will be enforced
- */
-struct rate_selection {
-        s8 rate_idx, nonerp_idx, probe_idx, max_rate_idx;
+ * struct ieee80211_tx_rate_control - rate control information for/from RC algo
+ *
+ * @hw: The hardware the algorithm is invoked for.
+ * @sband: The band this frame is being transmitted on.
+ * @bss_conf: the current BSS configuration
+ * @reported_rate: The rate control algorithm can fill this in to indicate
+ *      which rate should be reported to userspace as the current rate and
+ *      used for rate calculations in the mesh network.
+ * @rts: whether RTS will be used for this frame because it is longer than the
+ *      RTS threshold
+ * @short_preamble: whether mac80211 will request short-preamble transmission
+ *      if the selected rate supports it
+ * @max_rate_idx: user-requested maximum rate (not MCS for now)
+ * @skb: the skb that will be transmitted, the control information in it needs
+ *      to be filled in
+ */
+struct ieee80211_tx_rate_control {
+        struct ieee80211_hw *hw;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_bss_conf *bss_conf;
+        struct sk_buff *skb;
+        struct ieee80211_tx_rate reported_rate;
+        bool rts, short_preamble;
+        u8 max_rate_idx;
 };
 
 struct rate_control_ops {
         struct module *module;
         const char *name;
         void *(*alloc)(struct ieee80211_hw *hw, struct dentry *debugfsdir);
-        void (*clear)(void *priv);
         void (*free)(void *priv);
 
         void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp);
@@ -1832,10 +1928,8 @@ struct rate_control_ops {
         void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta,
                           struct sk_buff *skb);
-        void (*get_rate)(void *priv, struct ieee80211_supported_band *sband,
-                         struct ieee80211_sta *sta, void *priv_sta,
-                         struct sk_buff *skb,
-                         struct rate_selection *sel);
+        void (*get_rate)(void *priv, struct ieee80211_sta *sta, void *priv_sta,
+                         struct ieee80211_tx_rate_control *txrc);
 
         void (*add_sta_debugfs)(void *priv, void *priv_sta,
                                 struct dentry *dir);