Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 43a3b2ead81a..799d05e12595 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -116,7 +116,8 @@ struct p54_edcf_queue_param {
         __le16 txop;
 } __packed;
 
-struct p54_rssi_linear_approximation {
+struct p54_rssi_db_entry {
+        u16 freq;
         s16 mul;
         s16 add;
         s16 longbow_unkn;
@@ -197,24 +198,28 @@ struct p54_common {
         u8 rx_diversity_mask;
         u8 tx_diversity_mask;
         unsigned int output_power;
+        struct p54_rssi_db_entry *cur_rssi;
         int noise;
         /* calibration, output power limit and rssi<->dBm conversation data */
         struct pda_iq_autocal_entry *iq_autocal;
         unsigned int iq_autocal_len;
         struct p54_cal_database *curve_data;
         struct p54_cal_database *output_limit;
-        struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
+        struct p54_cal_database *rssi_db;
         struct ieee80211_supported_band *band_table[IEEE80211_NUM_BANDS];
 
         /* BBP/MAC state */
         u8 mac_addr[ETH_ALEN];
         u8 bssid[ETH_ALEN];
+        u8 mc_maclist[4][ETH_ALEN];
         u16 wakeup_timer;
         unsigned int filter_flags;
+        int mc_maclist_num;
         int mode;
         u32 tsf_low32, tsf_high32;
         u32 basic_rate_mask;
         u16 aid;
+        u8 coverage_class;
         bool powersave_override;
         __le32 beacon_req_id;
         struct completion beacon_comp;