diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-07-23 06:02:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-27 15:24:14 -0400 |
commit | f83da96564b2a2f4ae75ea971b357458e5240b61 (patch) | |
tree | e963208e7340d7c620581505f0b9b2f0d774295a /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | 9e98ac65a39df54fb0520cd86d1e7373319df00f (diff) |
ath9k: Cleanup return values
Cleanup aggregation start/stop function interfaces.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.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 | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index c039d0ac5ff..2c01fda5b72 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -695,25 +695,20 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, | |||
695 | status != ATH_AGGR_BAW_CLOSED); | 695 | status != ATH_AGGR_BAW_CLOSED); |
696 | } | 696 | } |
697 | 697 | ||
698 | int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, | 698 | void ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, |
699 | u16 tid, u16 *ssn) | 699 | u16 tid, u16 *ssn) |
700 | { | 700 | { |
701 | struct ath_atx_tid *txtid; | 701 | struct ath_atx_tid *txtid; |
702 | struct ath_node *an; | 702 | struct ath_node *an; |
703 | 703 | ||
704 | an = (struct ath_node *)sta->drv_priv; | 704 | an = (struct ath_node *)sta->drv_priv; |
705 | 705 | txtid = ATH_AN_2_TID(an, tid); | |
706 | if (sc->sc_flags & SC_OP_TXAGGR) { | 706 | txtid->state |= AGGR_ADDBA_PROGRESS; |
707 | txtid = ATH_AN_2_TID(an, tid); | 707 | ath_tx_pause_tid(sc, txtid); |
708 | txtid->state |= AGGR_ADDBA_PROGRESS; | 708 | *ssn = txtid->seq_start; |
709 | ath_tx_pause_tid(sc, txtid); | ||
710 | *ssn = txtid->seq_start; | ||
711 | } | ||
712 | |||
713 | return 0; | ||
714 | } | 709 | } |
715 | 710 | ||
716 | int ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) | 711 | void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) |
717 | { | 712 | { |
718 | struct ath_node *an = (struct ath_node *)sta->drv_priv; | 713 | struct ath_node *an = (struct ath_node *)sta->drv_priv; |
719 | struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid); | 714 | struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid); |
@@ -723,11 +718,11 @@ int ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) | |||
723 | INIT_LIST_HEAD(&bf_head); | 718 | INIT_LIST_HEAD(&bf_head); |
724 | 719 | ||
725 | if (txtid->state & AGGR_CLEANUP) | 720 | if (txtid->state & AGGR_CLEANUP) |
726 | return 0; | 721 | return; |
727 | 722 | ||
728 | if (!(txtid->state & AGGR_ADDBA_COMPLETE)) { | 723 | if (!(txtid->state & AGGR_ADDBA_COMPLETE)) { |
729 | txtid->state &= ~AGGR_ADDBA_PROGRESS; | 724 | txtid->state &= ~AGGR_ADDBA_PROGRESS; |
730 | return 0; | 725 | return; |
731 | } | 726 | } |
732 | 727 | ||
733 | ath_tx_pause_tid(sc, txtid); | 728 | ath_tx_pause_tid(sc, txtid); |
@@ -756,8 +751,6 @@ int ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) | |||
756 | txtid->state &= ~AGGR_ADDBA_COMPLETE; | 751 | txtid->state &= ~AGGR_ADDBA_COMPLETE; |
757 | ath_tx_flush_tid(sc, txtid); | 752 | ath_tx_flush_tid(sc, txtid); |
758 | } | 753 | } |
759 | |||
760 | return 0; | ||
761 | } | 754 | } |
762 | 755 | ||
763 | void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) | 756 | void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid) |