Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6490e334 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fc7707a4

drivers/net/wireless/ath/carl9170/tx.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -156,10 +156,8 @@ static void carl9170_tx_ps_unblock(struct ar9170 *ar, struct sk_buff *skb) 




static void carl9170_tx_accounting_free(struct ar9170 *ar, struct sk_buff *skb)

static void carl9170_tx_accounting_free(struct ar9170 *ar, struct sk_buff *skb)

{

{

	struct ieee80211_tx_info *txinfo;

	int queue;

	int queue;





	txinfo = IEEE80211_SKB_CB(skb);

	queue = skb_get_queue_mapping(skb);

	queue = skb_get_queue_mapping(skb);





	spin_lock_bh(&ar->tx_stats_lock);

	spin_lock_bh(&ar->tx_stats_lock);
@@ -380,7 +378,6 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar, 
{

{

	struct _carl9170_tx_superframe *super = (void *) skb->data;

	struct _carl9170_tx_superframe *super = (void *) skb->data;

	struct ieee80211_hdr *hdr = (void *) super->frame_data;

	struct ieee80211_hdr *hdr = (void *) super->frame_data;

	struct carl9170_tx_info *ar_info;

	struct ieee80211_sta *sta;

	struct ieee80211_sta *sta;

	struct carl9170_sta_info *sta_info;

	struct carl9170_sta_info *sta_info;

	struct carl9170_sta_tid *tid_info;

	struct carl9170_sta_tid *tid_info;
@@ -391,8 +388,6 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar, 
	   (!(super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_AGGR))))

	   (!(super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_AGGR))))

		return;

		return;





	ar_info = (void *) txinfo->rate_driver_data;



	rcu_read_lock();

	rcu_read_lock();

	sta = __carl9170_get_tx_sta(ar, skb);

	sta = __carl9170_get_tx_sta(ar, skb);

	if (unlikely(!sta))

	if (unlikely(!sta))
@@ -623,7 +618,6 @@ static void __carl9170_tx_process_status(struct ar9170 *ar, 
{

{

	struct sk_buff *skb;

	struct sk_buff *skb;

	struct ieee80211_tx_info *txinfo;

	struct ieee80211_tx_info *txinfo;

	struct carl9170_tx_info *arinfo;

	unsigned int r, t, q;

	unsigned int r, t, q;

	bool success = true;

	bool success = true;
@@ -639,7 +633,6 @@ static void __carl9170_tx_process_status(struct ar9170 *ar, 
	}

	}





	txinfo = IEEE80211_SKB_CB(skb);

	txinfo = IEEE80211_SKB_CB(skb);

	arinfo = (void *) txinfo->rate_driver_data;





	if (!(info & CARL9170_TX_STATUS_SUCCESS))

	if (!(info & CARL9170_TX_STATUS_SUCCESS))

		success = false;

		success = false;
@@ -1321,7 +1314,6 @@ static bool carl9170_tx_ampdu_queue(struct ar9170 *ar, 
	struct carl9170_sta_info *sta_info;

	struct carl9170_sta_info *sta_info;

	struct carl9170_sta_tid *agg;

	struct carl9170_sta_tid *agg;

	struct sk_buff *iter;

	struct sk_buff *iter;

	unsigned int max;

	u16 tid, seq, qseq, off;

	u16 tid, seq, qseq, off;

	bool run = false;

	bool run = false;
@@ -1331,7 +1323,6 @@ static bool carl9170_tx_ampdu_queue(struct ar9170 *ar, 




	rcu_read_lock();

	rcu_read_lock();

	agg = rcu_dereference(sta_info->agg[tid]);

	agg = rcu_dereference(sta_info->agg[tid]);

	max = sta_info->ampdu_max_len;





	if (!agg)

	if (!agg)

		goto err_unlock_rcu;

		goto err_unlock_rcu;