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

Commit 75c8ec71 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 1e60896f 77d2ece6

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

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 
	 * right now, so it's not too bad...

	 */

	rxs->mactime = ath5k_extend_tsf(ah, rs->rs_tstamp);

	rxs->flag |= RX_FLAG_MACTIME_MPDU;

	rxs->flag |= RX_FLAG_MACTIME_START;



	rxs->freq = ah->curchan->center_freq;

	rxs->band = ah->curchan->band;

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

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, 
	rx_status->freq = hw->conf.channel->center_freq;

	rx_status->signal =  rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;

	rx_status->antenna = rxbuf->rxstatus.rs_antenna;

	rx_status->flag |= RX_FLAG_MACTIME_MPDU;

	rx_status->flag |= RX_FLAG_MACTIME_START;



	return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common, 
	rx_status->freq = hw->conf.channel->center_freq;

	rx_status->signal = ah->noise + rx_stats->rs_rssi;

	rx_status->antenna = rx_stats->rs_antenna;

	rx_status->flag |= RX_FLAG_MACTIME_MPDU;

	rx_status->flag |= RX_FLAG_MACTIME_START;

	if (rx_stats->rs_moreaggr)

		rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;

drivers/net/wireless/b43/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) 
		status.mactime += mactime;

		if (low_mactime_now <= mactime)

			status.mactime -= 0x10000;

		status.flag |= RX_FLAG_MACTIME_MPDU;

		status.flag |= RX_FLAG_MACTIME_START;

	}



	chanid = (chanstat & B43_RX_CHAN_ID) >> B43_RX_CHAN_ID_SHIFT;

drivers/net/wireless/b43legacy/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev, 
		status.mactime += mactime;

		if (low_mactime_now <= mactime)

			status.mactime -= 0x10000;

		status.flag |= RX_FLAG_MACTIME_MPDU;

		status.flag |= RX_FLAG_MACTIME_START;

	}



	chanid = (chanstat & B43legacy_RX_CHAN_ID) >>