diff options
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index b8d1e04aa9b9..f9b1218c761a 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
| @@ -3098,14 +3098,14 @@ static void mwl8k_update_survey(struct mwl8k_priv *priv, | |||
| 3098 | 3098 | ||
| 3099 | cca_cnt = ioread32(priv->regs + NOK_CCA_CNT_REG); | 3099 | cca_cnt = ioread32(priv->regs + NOK_CCA_CNT_REG); |
| 3100 | cca_cnt /= 1000; /* uSecs to mSecs */ | 3100 | cca_cnt /= 1000; /* uSecs to mSecs */ |
| 3101 | survey->channel_time_busy = (u64) cca_cnt; | 3101 | survey->time_busy = (u64) cca_cnt; |
| 3102 | 3102 | ||
| 3103 | rx_rdy = ioread32(priv->regs + BBU_RXRDY_CNT_REG); | 3103 | rx_rdy = ioread32(priv->regs + BBU_RXRDY_CNT_REG); |
| 3104 | rx_rdy /= 1000; /* uSecs to mSecs */ | 3104 | rx_rdy /= 1000; /* uSecs to mSecs */ |
| 3105 | survey->channel_time_rx = (u64) rx_rdy; | 3105 | survey->time_rx = (u64) rx_rdy; |
| 3106 | 3106 | ||
| 3107 | priv->channel_time = jiffies - priv->channel_time; | 3107 | priv->channel_time = jiffies - priv->channel_time; |
| 3108 | survey->channel_time = jiffies_to_msecs(priv->channel_time); | 3108 | survey->time = jiffies_to_msecs(priv->channel_time); |
| 3109 | 3109 | ||
| 3110 | survey->channel = channel; | 3110 | survey->channel = channel; |
| 3111 | 3111 | ||
| @@ -3115,9 +3115,9 @@ static void mwl8k_update_survey(struct mwl8k_priv *priv, | |||
| 3115 | survey->noise = nf * -1; | 3115 | survey->noise = nf * -1; |
| 3116 | 3116 | ||
| 3117 | survey->filled = SURVEY_INFO_NOISE_DBM | | 3117 | survey->filled = SURVEY_INFO_NOISE_DBM | |
| 3118 | SURVEY_INFO_CHANNEL_TIME | | 3118 | SURVEY_INFO_TIME | |
| 3119 | SURVEY_INFO_CHANNEL_TIME_BUSY | | 3119 | SURVEY_INFO_TIME_BUSY | |
| 3120 | SURVEY_INFO_CHANNEL_TIME_RX; | 3120 | SURVEY_INFO_TIME_RX; |
| 3121 | } | 3121 | } |
| 3122 | 3122 | ||
| 3123 | /* | 3123 | /* |
