diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-07-29 08:08:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-09 15:42:38 -0400 |
commit | 0f9dc298215ed96383378eca1a6f63a1d190f44a (patch) | |
tree | f902dcd138dbff546a2b73c62facefb2867bc4fc /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | 3f4c4bdd9d4d069e3d5e6154bfdd809f7923a90b (diff) |
ath9k: Remove virtual wiphy specific frame type
This patch cleanups virtual wiphy specific frametype structure
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index cc595712f518..e815e825e9cb 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1777,7 +1777,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, | |||
1777 | INIT_LIST_HEAD(&bf_head); | 1777 | INIT_LIST_HEAD(&bf_head); |
1778 | list_add_tail(&bf->list, &bf_head); | 1778 | list_add_tail(&bf->list, &bf_head); |
1779 | 1779 | ||
1780 | bf->bf_state.bfs_ftype = txctl->frame_type; | ||
1781 | bf->bf_state.bfs_paprd = txctl->paprd; | 1780 | bf->bf_state.bfs_paprd = txctl->paprd; |
1782 | 1781 | ||
1783 | if (bf->bf_state.bfs_paprd) | 1782 | if (bf->bf_state.bfs_paprd) |
@@ -1876,7 +1875,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
1876 | /*****************/ | 1875 | /*****************/ |
1877 | 1876 | ||
1878 | static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, | 1877 | static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, |
1879 | int tx_flags, int ftype, struct ath_txq *txq) | 1878 | int tx_flags, struct ath_txq *txq) |
1880 | { | 1879 | { |
1881 | struct ieee80211_hw *hw = sc->hw; | 1880 | struct ieee80211_hw *hw = sc->hw; |
1882 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 1881 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
@@ -1961,8 +1960,7 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf, | |||
1961 | complete(&sc->paprd_complete); | 1960 | complete(&sc->paprd_complete); |
1962 | } else { | 1961 | } else { |
1963 | ath_debug_stat_tx(sc, bf, ts, txq); | 1962 | ath_debug_stat_tx(sc, bf, ts, txq); |
1964 | ath_tx_complete(sc, skb, tx_flags, | 1963 | ath_tx_complete(sc, skb, tx_flags, txq); |
1965 | bf->bf_state.bfs_ftype, txq); | ||
1966 | } | 1964 | } |
1967 | /* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't | 1965 | /* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't |
1968 | * accidentally reference it later. | 1966 | * accidentally reference it later. |