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

Commit 4f4aeb7f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents a1868dc2 51a0d38d

drivers/net/wireless/ath/ath5k/base.c

+3 −14
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ static int ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb); 
static int ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,

		struct ath5k_txq *txq);

static int ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan);

static int ath5k_reset_wake(struct ath5k_softc *sc);

static int ath5k_start(struct ieee80211_hw *hw);

static void ath5k_stop(struct ieee80211_hw *hw);

static int ath5k_add_interface(struct ieee80211_hw *hw,
@@ -2770,7 +2769,7 @@ ath5k_tasklet_reset(unsigned long data) 
{

	struct ath5k_softc *sc = (void *)data;



	ath5k_reset_wake(sc);

	ath5k_reset(sc, sc->curchan);

}



/*
@@ -2941,20 +2940,10 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan) 
	ath5k_beacon_config(sc);

	/* intrs are enabled by ath5k_beacon_config */



	return 0;

err:

	return ret;

}



static int

ath5k_reset_wake(struct ath5k_softc *sc)

{

	int ret;



	ret = ath5k_reset(sc, sc->curchan);

	if (!ret)

	ieee80211_wake_queues(sc->hw);



	return 0;

err:

	return ret;

}

net/mac80211/agg-tx.c

+4 −2
Original line number Diff line number Diff line
@@ -332,14 +332,16 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) 
		IEEE80211_QUEUE_STOP_REASON_AGGREGATION);



	spin_unlock(&local->ampdu_lock);

	spin_unlock_bh(&sta->lock);



	/* send an addBA request */

	/* prepare tid data */

	sta->ampdu_mlme.dialog_token_allocator++;

	sta->ampdu_mlme.tid_tx[tid]->dialog_token =

			sta->ampdu_mlme.dialog_token_allocator;

	sta->ampdu_mlme.tid_tx[tid]->ssn = start_seq_num;



	spin_unlock_bh(&sta->lock);



	/* send AddBA request */

	ieee80211_send_addba_request(sdata, pubsta->addr, tid,

			 sta->ampdu_mlme.tid_tx[tid]->dialog_token,

			 sta->ampdu_mlme.tid_tx[tid]->ssn,

net/mac80211/rx.c

+11 −2
Original line number Diff line number Diff line
@@ -1818,17 +1818,26 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames) 
		return RX_CONTINUE;



	if (ieee80211_is_back_req(bar->frame_control)) {

		struct {

			__le16 control, start_seq_num;

		} __packed bar_data;



		if (!rx->sta)

			return RX_DROP_MONITOR;



		if (skb_copy_bits(skb, offsetof(struct ieee80211_bar, control),

				  &bar_data, sizeof(bar_data)))

			return RX_DROP_MONITOR;



		spin_lock(&rx->sta->lock);

		tid = le16_to_cpu(bar->control) >> 12;

		tid = le16_to_cpu(bar_data.control) >> 12;

		if (!rx->sta->ampdu_mlme.tid_active_rx[tid]) {

			spin_unlock(&rx->sta->lock);

			return RX_DROP_MONITOR;

		}

		tid_agg_rx = rx->sta->ampdu_mlme.tid_rx[tid];



		start_seq_num = le16_to_cpu(bar->start_seq_num) >> 4;

		start_seq_num = le16_to_cpu(bar_data.start_seq_num) >> 4;



		/* reset session timer */

		if (tid_agg_rx->timeout)