Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-flexiantxendom0-3.2.10.git] / drivers / net / wireless / rt2x00 / rt2x00.h

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 9d1a158..c446db6 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -662,6 +662,7 @@ enum rt2x00_state_flags {
         * Driver configuration
         */
        CONFIG_CHANNEL_HT40,
+       CONFIG_POWERSAVING,
 };
 
 /*
@@ -681,6 +682,7 @@ enum rt2x00_capability_flags {
        REQUIRE_TASKLET_CONTEXT,
        REQUIRE_SW_SEQNO,
        REQUIRE_HT_TX_DESC,
+       REQUIRE_PS_AUTOWAKE,
 
        /*
         * Capabilities
@@ -697,6 +699,7 @@ enum rt2x00_capability_flags {
        CAPABILITY_EXTERNAL_LNA_A,
        CAPABILITY_EXTERNAL_LNA_BG,
        CAPABILITY_DOUBLE_ANTENNA,
+       CAPABILITY_BT_COEXIST,
 };
 
 /*
@@ -874,10 +877,20 @@ struct rt2x00_dev {
        u8 calibration[2];
 
        /*
+        * Association id.
+        */
+       u16 aid;
+
+       /*
         * Beacon interval.
         */
        u16 beacon_int;
 
+       /**
+        * Timestamp of last received beacon
+        */
+       unsigned long last_beacon;
+
        /*
         * Low level statistics which will have
         * to be kept up to date while device is running.
@@ -906,6 +919,11 @@ struct rt2x00_dev {
        struct work_struct txdone_work;
 
        /*
+        * Powersaving work
+        */
+       struct delayed_work autowakeup_work;
+
+       /*
         * Data queue arrays for RX, TX, Beacon and ATIM.
         */
        unsigned int data_queues;