diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 2d4ec1a65957..27d4ece4d467 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -2475,19 +2475,17 @@ static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta, | |||
2475 | gfp_t gfp) | 2475 | gfp_t gfp) |
2476 | { | 2476 | { |
2477 | struct iwl_lq_sta *lq_sta; | 2477 | struct iwl_lq_sta *lq_sta; |
2478 | struct iwl_station_priv *sta_priv = (struct iwl_station_priv *) sta->drv_priv; | ||
2478 | struct iwl_priv *priv; | 2479 | struct iwl_priv *priv; |
2479 | int i, j; | 2480 | int i, j; |
2480 | 2481 | ||
2481 | priv = (struct iwl_priv *)priv_rate; | 2482 | priv = (struct iwl_priv *)priv_rate; |
2482 | IWL_DEBUG_RATE(priv, "create station rate scale window\n"); | 2483 | IWL_DEBUG_RATE(priv, "create station rate scale window\n"); |
2483 | 2484 | ||
2484 | lq_sta = kzalloc(sizeof(struct iwl_lq_sta), gfp); | 2485 | lq_sta = &sta_priv->lq_sta; |
2485 | 2486 | ||
2486 | if (lq_sta == NULL) | ||
2487 | return NULL; | ||
2488 | lq_sta->lq.sta_id = 0xff; | 2487 | lq_sta->lq.sta_id = 0xff; |
2489 | 2488 | ||
2490 | |||
2491 | for (j = 0; j < LQ_SIZE; j++) | 2489 | for (j = 0; j < LQ_SIZE; j++) |
2492 | for (i = 0; i < IWL_RATE_COUNT; i++) | 2490 | for (i = 0; i < IWL_RATE_COUNT; i++) |
2493 | rs_rate_scale_clear_window(&lq_sta->lq_info[j].win[i]); | 2491 | rs_rate_scale_clear_window(&lq_sta->lq_info[j].win[i]); |
@@ -2719,11 +2717,9 @@ static void rs_free(void *priv_rate) | |||
2719 | static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, | 2717 | static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, |
2720 | void *priv_sta) | 2718 | void *priv_sta) |
2721 | { | 2719 | { |
2722 | struct iwl_lq_sta *lq_sta = priv_sta; | ||
2723 | struct iwl_priv *priv __maybe_unused = priv_r; | 2720 | struct iwl_priv *priv __maybe_unused = priv_r; |
2724 | 2721 | ||
2725 | IWL_DEBUG_RATE(priv, "enter\n"); | 2722 | IWL_DEBUG_RATE(priv, "enter\n"); |
2726 | kfree(lq_sta); | ||
2727 | IWL_DEBUG_RATE(priv, "leave\n"); | 2723 | IWL_DEBUG_RATE(priv, "leave\n"); |
2728 | } | 2724 | } |
2729 | 2725 | ||