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

Commit 0f9dc298 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Remove virtual wiphy specific frame type 



This patch cleanups virtual wiphy specific frametype structure

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3f4c4bdd

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −3
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ struct ath_buf_state { 
	u8 bf_type;

	u8 bfs_paprd;

	unsigned long bfs_paprd_timestamp;

	enum ath9k_internal_frame_type bfs_ftype;

};



struct ath_buf {
@@ -273,8 +272,6 @@ struct ath_node { 
struct ath_tx_control {

	struct ath_txq *txq;

	struct ath_node *an;

	int if_id;

	enum ath9k_internal_frame_type frame_type;

	u8 paprd;

};

drivers/net/wireless/ath/ath9k/rc.h

+0 −6
Original line number Diff line number Diff line
@@ -221,12 +221,6 @@ struct ath_rate_priv { 
	struct ath_rc_stats rcstats[RATE_TABLE_SIZE];

};



enum ath9k_internal_frame_type {

	ATH9K_IFT_NOT_INTERNAL,

	ATH9K_IFT_PAUSE,

	ATH9K_IFT_UNPAUSE

};



#ifdef CONFIG_ATH9K_RATE_CONTROL

int ath_rate_control_register(void);

void ath_rate_control_unregister(void);

drivers/net/wireless/ath/ath9k/xmit.c

+2 −4
Original line number Diff line number Diff line
@@ -1777,7 +1777,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
		INIT_LIST_HEAD(&bf_head);

		list_add_tail(&bf->list, &bf_head);



		bf->bf_state.bfs_ftype = txctl->frame_type;

		bf->bf_state.bfs_paprd = txctl->paprd;



		if (bf->bf_state.bfs_paprd)
@@ -1876,7 +1875,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
/*****************/



static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,

			    int tx_flags, int ftype, struct ath_txq *txq)

			    int tx_flags, struct ath_txq *txq)

{

	struct ieee80211_hw *hw = sc->hw;

	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, 
			complete(&sc->paprd_complete);

	} else {

		ath_debug_stat_tx(sc, bf, ts, txq);

		ath_tx_complete(sc, skb, tx_flags,

				bf->bf_state.bfs_ftype, txq);

		ath_tx_complete(sc, skb, tx_flags, txq);

	}

	/* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't

	 * accidentally reference it later.