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

Commit cbe8c735 authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

ath9k_hw: remove aggregation protection mode 



when aggregation protection mode is enabled the hardware needs
to send RTS/CTS for each HT frame. Currently its disabled so
remove the unused call backs.

Signed-off-by: default avatarMohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7e4b4eec

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

+0 −10
Original line number Diff line number Diff line
@@ -415,15 +415,6 @@ static void ar9002_hw_clr11n_aggr(struct ath_hw *ah, void *ds) 
	ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr);

}



static void ar9002_hw_set11n_burstduration(struct ath_hw *ah, void *ds,

					   u32 burstDuration)

{

	struct ar5416_desc *ads = AR5416DESC(ds);



	ads->ds_ctl2 &= ~AR_BurstDur;

	ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur);

}



void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,

			  u32 size, u32 flags)

{
@@ -456,6 +447,5 @@ void ar9002_hw_attach_mac_ops(struct ath_hw *ah) 
	ops->set11n_aggr_middle = ar9002_hw_set11n_aggr_middle;

	ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last;

	ops->clr11n_aggr = ar9002_hw_clr11n_aggr;

	ops->set11n_burstduration = ar9002_hw_set11n_burstduration;

	ops->set_clrdmask = ar9002_hw_set_clrdmask;

}

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

+0 −11
Original line number Diff line number Diff line
@@ -484,16 +484,6 @@ static void ar9003_hw_clr11n_aggr(struct ath_hw *ah, void *ds) 
	ads->ctl12 &= (~AR_IsAggr & ~AR_MoreAggr);

}



static void ar9003_hw_set11n_burstduration(struct ath_hw *ah, void *ds,

					   u32 burstDuration)

{

	struct ar9003_txc *ads = (struct ar9003_txc *) ds;



	ads->ctl13 &= ~AR_BurstDur;

	ads->ctl13 |= SM(burstDuration, AR_BurstDur);



}



void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains)

{

	struct ar9003_txc *ads = ds;
@@ -518,7 +508,6 @@ void ar9003_hw_attach_mac_ops(struct ath_hw *hw) 
	ops->set11n_aggr_middle = ar9003_hw_set11n_aggr_middle;

	ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last;

	ops->clr11n_aggr = ar9003_hw_clr11n_aggr;

	ops->set11n_burstduration = ar9003_hw_set11n_burstduration;

	ops->set_clrdmask = ar9003_hw_set_clrdmask;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ struct ath_node; 
#define	ATH_TXQ_SETUP(sc, i)        ((sc)->tx.txqsetup & (1<<i))



struct ath_config {

	u32 ath_aggr_prot;

	u16 txpowlimit;

	u8 cabqReadytime;

};

drivers/net/wireless/ath/ath9k/hw-ops.h

+0 −6
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ static inline void ath9k_hw_clr11n_aggr(struct ath_hw *ah, void *ds) 
	ath9k_hw_ops(ah)->clr11n_aggr(ah, ds);

}



static inline void ath9k_hw_set11n_burstduration(struct ath_hw *ah, void *ds,

						 u32 burstDuration)

{

	ath9k_hw_ops(ah)->set11n_burstduration(ah, ds, burstDuration);

}



static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val)

{

	ath9k_hw_ops(ah)->set_clrdmask(ah, ds, val);

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

+0 −2
Original line number Diff line number Diff line
@@ -628,8 +628,6 @@ struct ath_hw_ops { 
				   u32 numDelims);

	void (*set11n_aggr_last)(struct ath_hw *ah, void *ds);

	void (*clr11n_aggr)(struct ath_hw *ah, void *ds);

	void (*set11n_burstduration)(struct ath_hw *ah, void *ds,

				     u32 burstDuration);

	void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val);

};