diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2012-07-17 07:45:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-17 15:11:38 -0400 |
commit | ef4ad63368e6162fb0b18861748fac49edfcbd03 (patch) | |
tree | 3ac3958361fe7ae2b12b4ef9c580f1a5faa65d8a /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | 6c43c090a92938c3e89ce3b7459f91c5159535e2 (diff) |
ath9k: Cleanup beacon logic
* The beaconing status routine is not required, since in
multi-VIF cases the HW beacon parameters should not be
re-configured.
* Remove SC_OP_TSF_RESET - when a beaconing interface comes
up the first time, the TSF has to be reset.
* Simplify ath9k_allow_beacon_config().
* Handle setting/clearing the SWBA interrupt properly.
* Remove the TSF mangling in IBSS mode, it is not required.
* General code cleanup.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 9dd8fbb847fd..4cce997d6867 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -389,6 +389,7 @@ struct ath_beacon_config { | |||
389 | u16 dtim_period; | 389 | u16 dtim_period; |
390 | u16 bmiss_timeout; | 390 | u16 bmiss_timeout; |
391 | u8 dtim_count; | 391 | u8 dtim_count; |
392 | bool enable_beacon; | ||
392 | }; | 393 | }; |
393 | 394 | ||
394 | struct ath_beacon { | 395 | struct ath_beacon { |
@@ -415,11 +416,13 @@ struct ath_beacon { | |||
415 | }; | 416 | }; |
416 | 417 | ||
417 | void ath_beacon_tasklet(unsigned long data); | 418 | void ath_beacon_tasklet(unsigned long data); |
418 | void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif); | 419 | bool ath9k_allow_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif); |
420 | void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif, | ||
421 | u32 changed); | ||
419 | void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif); | 422 | void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif); |
420 | void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif); | 423 | void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif); |
421 | int ath_beaconq_config(struct ath_softc *sc); | 424 | int ath_beaconq_config(struct ath_softc *sc); |
422 | void ath_set_beacon(struct ath_softc *sc); | 425 | void ath9k_set_beacon(struct ath_softc *sc); |
423 | void ath9k_set_beaconing_status(struct ath_softc *sc, bool status); | 426 | void ath9k_set_beaconing_status(struct ath_softc *sc, bool status); |
424 | 427 | ||
425 | /*******************/ | 428 | /*******************/ |
@@ -622,7 +625,6 @@ enum sc_op_flags { | |||
622 | SC_OP_INVALID, | 625 | SC_OP_INVALID, |
623 | SC_OP_BEACONS, | 626 | SC_OP_BEACONS, |
624 | SC_OP_RXFLUSH, | 627 | SC_OP_RXFLUSH, |
625 | SC_OP_TSF_RESET, | ||
626 | SC_OP_ANI_RUN, | 628 | SC_OP_ANI_RUN, |
627 | SC_OP_PRIM_STA_VIF, | 629 | SC_OP_PRIM_STA_VIF, |
628 | SC_OP_HW_RESET, | 630 | SC_OP_HW_RESET, |