diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-10-31 16:45:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:17:35 -0500 |
commit | f161796700ed89b07dff2ad4ba3a932bc721af7e (patch) | |
tree | 1ae9b0519d4871c601218f8a59d530a3d86eb279 /drivers | |
parent | 74508b29c51158e5b45bca13e702c68ef5c3b641 (diff) |
ath9k: correct warning about unintialized variable 'tid'
drivers/net/wireless/ath9k/xmit.c: In function ‘ath_tx_start’:
drivers/net/wireless/ath9k/xmit.c:1858: warning: ‘tid’ may be used uninitialized in this function
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index fe386b6dadac..8937728b0301 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
@@ -1859,11 +1859,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, | |||
1859 | struct ath_hal *ah = sc->sc_ah; | 1859 | struct ath_hal *ah = sc->sc_ah; |
1860 | int frm_type; | 1860 | int frm_type; |
1861 | 1861 | ||
1862 | if (tx_info->control.sta) { | ||
1863 | an = (struct ath_node *)tx_info->control.sta->drv_priv; | ||
1864 | tid = ATH_AN_2_TID(an, bf->bf_tidno); | ||
1865 | } | ||
1866 | |||
1867 | frm_type = get_hw_packet_type(skb); | 1862 | frm_type = get_hw_packet_type(skb); |
1868 | 1863 | ||
1869 | INIT_LIST_HEAD(&bf_head); | 1864 | INIT_LIST_HEAD(&bf_head); |
@@ -1890,7 +1885,11 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, | |||
1890 | 1885 | ||
1891 | spin_lock_bh(&txctl->txq->axq_lock); | 1886 | spin_lock_bh(&txctl->txq->axq_lock); |
1892 | 1887 | ||
1893 | if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR)) { | 1888 | if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) && |
1889 | tx_info->control.sta) { | ||
1890 | an = (struct ath_node *)tx_info->control.sta->drv_priv; | ||
1891 | tid = ATH_AN_2_TID(an, bf->bf_tidno); | ||
1892 | |||
1894 | if (ath_aggr_query(sc, an, bf->bf_tidno)) { | 1893 | if (ath_aggr_query(sc, an, bf->bf_tidno)) { |
1895 | /* | 1894 | /* |
1896 | * Try aggregation if it's a unicast data frame | 1895 | * Try aggregation if it's a unicast data frame |