aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-05-07 05:13:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-10 15:54:47 -0400
commit6490e334bc3af960965adfcef5acf6e5cbdd925c (patch)
tree8876339d5c04513f28e2929827b6adf1f7346abd
parentfc7707a469785fe786ddc66d723c150226ddc40e (diff)
carl9170: fix -Wunused-but-set-variable warnings
tx.c: In function ‘carl9170_tx_accounting_free’: tx.c:159:28: warning: variable ‘txinfo’ set but not used tx.c: In function ‘carl9170_tx_status_process_ampdu’: tx.c:383:27: warning: variable ‘ar_info’ set but not used tx.c: In function ‘__carl9170_tx_process_status’: tx.c:626:27: warning: variable ‘arinfo’ set but not used tx.c: In function ‘carl9170_tx_ampdu_queue’: tx.c:1324:15: warning: variable ‘max’ set but not used Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/carl9170/tx.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index bf2eff9dd582..e94084fcf6f5 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -156,10 +156,8 @@ out_rcu:
156 156
157static void carl9170_tx_accounting_free(struct ar9170 *ar, struct sk_buff *skb) 157static void carl9170_tx_accounting_free(struct ar9170 *ar, struct sk_buff *skb)
158{ 158{
159 struct ieee80211_tx_info *txinfo;
160 int queue; 159 int queue;
161 160
162 txinfo = IEEE80211_SKB_CB(skb);
163 queue = skb_get_queue_mapping(skb); 161 queue = skb_get_queue_mapping(skb);
164 162
165 spin_lock_bh(&ar->tx_stats_lock); 163 spin_lock_bh(&ar->tx_stats_lock);
@@ -380,7 +378,6 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar,
380{ 378{
381 struct _carl9170_tx_superframe *super = (void *) skb->data; 379 struct _carl9170_tx_superframe *super = (void *) skb->data;
382 struct ieee80211_hdr *hdr = (void *) super->frame_data; 380 struct ieee80211_hdr *hdr = (void *) super->frame_data;
383 struct carl9170_tx_info *ar_info;
384 struct ieee80211_sta *sta; 381 struct ieee80211_sta *sta;
385 struct carl9170_sta_info *sta_info; 382 struct carl9170_sta_info *sta_info;
386 struct carl9170_sta_tid *tid_info; 383 struct carl9170_sta_tid *tid_info;
@@ -391,8 +388,6 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar,
391 (!(super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_AGGR)))) 388 (!(super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_AGGR))))
392 return; 389 return;
393 390
394 ar_info = (void *) txinfo->rate_driver_data;
395
396 rcu_read_lock(); 391 rcu_read_lock();
397 sta = __carl9170_get_tx_sta(ar, skb); 392 sta = __carl9170_get_tx_sta(ar, skb);
398 if (unlikely(!sta)) 393 if (unlikely(!sta))
@@ -623,7 +618,6 @@ static void __carl9170_tx_process_status(struct ar9170 *ar,
623{ 618{
624 struct sk_buff *skb; 619 struct sk_buff *skb;
625 struct ieee80211_tx_info *txinfo; 620 struct ieee80211_tx_info *txinfo;
626 struct carl9170_tx_info *arinfo;
627 unsigned int r, t, q; 621 unsigned int r, t, q;
628 bool success = true; 622 bool success = true;
629 623
@@ -639,7 +633,6 @@ static void __carl9170_tx_process_status(struct ar9170 *ar,
639 } 633 }
640 634
641 txinfo = IEEE80211_SKB_CB(skb); 635 txinfo = IEEE80211_SKB_CB(skb);
642 arinfo = (void *) txinfo->rate_driver_data;
643 636
644 if (!(info & CARL9170_TX_STATUS_SUCCESS)) 637 if (!(info & CARL9170_TX_STATUS_SUCCESS))
645 success = false; 638 success = false;
@@ -1321,7 +1314,6 @@ static bool carl9170_tx_ampdu_queue(struct ar9170 *ar,
1321 struct carl9170_sta_info *sta_info; 1314 struct carl9170_sta_info *sta_info;
1322 struct carl9170_sta_tid *agg; 1315 struct carl9170_sta_tid *agg;
1323 struct sk_buff *iter; 1316 struct sk_buff *iter;
1324 unsigned int max;
1325 u16 tid, seq, qseq, off; 1317 u16 tid, seq, qseq, off;
1326 bool run = false; 1318 bool run = false;
1327 1319
@@ -1331,7 +1323,6 @@ static bool carl9170_tx_ampdu_queue(struct ar9170 *ar,
1331 1323
1332 rcu_read_lock(); 1324 rcu_read_lock();
1333 agg = rcu_dereference(sta_info->agg[tid]); 1325 agg = rcu_dereference(sta_info->agg[tid]);
1334 max = sta_info->ampdu_max_len;
1335 1326
1336 if (!agg) 1327 if (!agg)
1337 goto err_unlock_rcu; 1328 goto err_unlock_rcu;