3 files changed, 15 insertions, 13 deletions

diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 0fe67d2da208..2fe713eda7ad 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -196,9 +196,9 @@ static int p54_generate_band(struct ieee80211_hw *dev,
                 dest->max_power = chan->max_power;
                 priv->survey[*chan_num].channel = &tmp->channels[j];
                 priv->survey[*chan_num].filled = SURVEY_INFO_NOISE_DBM |
-                        SURVEY_INFO_CHANNEL_TIME |
-                        SURVEY_INFO_CHANNEL_TIME_BUSY |
-                        SURVEY_INFO_CHANNEL_TIME_TX;
+                        SURVEY_INFO_TIME |
+                        SURVEY_INFO_TIME_BUSY |
+                        SURVEY_INFO_TIME_TX;
                 dest->hw_value = (*chan_num);
                 j++;
                 (*chan_num)++;
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 97aeff0edb84..b9250d75d253 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -305,9 +305,9 @@ static void p54_reset_stats(struct p54_common *priv)
                 struct survey_info *info = &priv->survey[chan->hw_value];
 
                 /* only reset channel statistics, don't touch .filled, etc. */
-                info->channel_time = 0;
-                info->channel_time_busy = 0;
-                info->channel_time_tx = 0;
+                info->time = 0;
+                info->time_busy = 0;
+                info->time_tx = 0;
         }
 
         priv->update_stats = true;
@@ -575,6 +575,8 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
                         key->hw_key_idx = 0xff;
                         goto out_unlock;
                 }
+
+                key->flags |= IEEE80211_KEY_FLAG_RESERVE_TAILROOM;
         } else {
                 slot = key->hw_key_idx;
 
@@ -634,7 +636,7 @@ static int p54_get_survey(struct ieee80211_hw *dev, int idx,
 
                 if (in_use) {
                         /* test if the reported statistics are valid. */
-                        if  (survey->channel_time != 0) {
+                        if  (survey->time != 0) {
                                 survey->filled |= SURVEY_INFO_IN_USE;
                         } else {
                                 /*
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 153c61539ec8..24e5ff9a9272 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -587,13 +587,13 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb)
         if (chan) {
                 struct survey_info *survey = &priv->survey[chan->hw_value];
                 survey->noise = clamp(priv->noise, -128, 127);
-                survey->channel_time = priv->survey_raw.active;
-                survey->channel_time_tx = priv->survey_raw.tx;
-                survey->channel_time_busy = priv->survey_raw.tx +
+                survey->time = priv->survey_raw.active;
+                survey->time_tx = priv->survey_raw.tx;
+                survey->time_busy = priv->survey_raw.tx +
                         priv->survey_raw.cca;
-                do_div(survey->channel_time, 1024);
-                do_div(survey->channel_time_tx, 1024);
-                do_div(survey->channel_time_busy, 1024);
+                do_div(survey->time, 1024);
+                do_div(survey->time_tx, 1024);
+                do_div(survey->time_busy, 1024);
         }
 
         tmp = p54_find_and_unlink_skb(priv, hdr->req_id);