Commit 6ebacbb7 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: rename RX_FLAG_TSFT

The flag isn't very descriptive -- the intention
is that the driver provides a TSF timestamp at
the beginning of the MPDU -- make that clearer
by renaming the flag to RX_FLAG_MACTIME_MPDU.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3e85b9e
...@@ -1361,7 +1361,7 @@ ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb, ...@@ -1361,7 +1361,7 @@ ath5k_receive_frame(struct ath5k_softc *sc, struct sk_buff *skb,
* right now, so it's not too bad... * right now, so it's not too bad...
*/ */
rxs->mactime = ath5k_extend_tsf(sc->ah, rs->rs_tstamp); rxs->mactime = ath5k_extend_tsf(sc->ah, rs->rs_tstamp);
rxs->flag |= RX_FLAG_TSFT; rxs->flag |= RX_FLAG_MACTIME_MPDU;
rxs->freq = sc->curchan->center_freq; rxs->freq = sc->curchan->center_freq;
rxs->band = sc->curchan->band; rxs->band = sc->curchan->band;
......
...@@ -616,7 +616,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, ...@@ -616,7 +616,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
rx_status->freq = hw->conf.channel->center_freq; rx_status->freq = hw->conf.channel->center_freq;
rx_status->signal = rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR; rx_status->signal = rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
rx_status->antenna = rxbuf->rxstatus.rs_antenna; rx_status->antenna = rxbuf->rxstatus.rs_antenna;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU;
return true; return true;
......
...@@ -983,7 +983,7 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common, ...@@ -983,7 +983,7 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
rx_status->freq = hw->conf.channel->center_freq; rx_status->freq = hw->conf.channel->center_freq;
rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi; rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
rx_status->antenna = rx_stats->rs_antenna; rx_status->antenna = rx_stats->rs_antenna;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU;
return 0; return 0;
} }
......
...@@ -652,7 +652,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -652,7 +652,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
status.mactime += mactime; status.mactime += mactime;
if (low_mactime_now <= mactime) if (low_mactime_now <= mactime)
status.mactime -= 0x10000; status.mactime -= 0x10000;
status.flag |= RX_FLAG_TSFT; status.flag |= RX_FLAG_MACTIME_MPDU;
} }
chanid = (chanstat & B43_RX_CHAN_ID) >> B43_RX_CHAN_ID_SHIFT; chanid = (chanstat & B43_RX_CHAN_ID) >> B43_RX_CHAN_ID_SHIFT;
......
...@@ -572,7 +572,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev, ...@@ -572,7 +572,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
status.mactime += mactime; status.mactime += mactime;
if (low_mactime_now <= mactime) if (low_mactime_now <= mactime)
status.mactime -= 0x10000; status.mactime -= 0x10000;
status.flag |= RX_FLAG_TSFT; status.flag |= RX_FLAG_MACTIME_MPDU;
} }
chanid = (chanstat & B43legacy_RX_CHAN_ID) >> chanid = (chanstat & B43legacy_RX_CHAN_ID) >>
......
...@@ -639,7 +639,7 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -639,7 +639,7 @@ void iwl4965_rx_reply_rx(struct iwl_priv *priv,
/* TSF isn't reliable. In order to allow smooth user experience, /* TSF isn't reliable. In order to allow smooth user experience,
* this W/A doesn't propagate it to the mac80211 */ * this W/A doesn't propagate it to the mac80211 */
/*rx_status.flag |= RX_FLAG_TSFT;*/ /*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/
priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp);
......
...@@ -1173,7 +1173,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv, ...@@ -1173,7 +1173,7 @@ void iwlagn_rx_reply_rx(struct iwl_priv *priv,
/* TSF isn't reliable. In order to allow smooth user experience, /* TSF isn't reliable. In order to allow smooth user experience,
* this W/A doesn't propagate it to the mac80211 */ * this W/A doesn't propagate it to the mac80211 */
/*rx_status.flag |= RX_FLAG_TSFT;*/ /*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/
priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp);
......
...@@ -367,7 +367,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) ...@@ -367,7 +367,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)
rx_status->mactime = ((u64)priv->tsf_high32) << 32 | tsf32; rx_status->mactime = ((u64)priv->tsf_high32) << 32 | tsf32;
priv->tsf_low32 = tsf32; priv->tsf_low32 = tsf32;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU;
if (hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN)) if (hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
header_len += hdr->align[0]; header_len += hdr->align[0];
......
...@@ -146,7 +146,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev) ...@@ -146,7 +146,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
rx_status.freq = dev->conf.channel->center_freq; rx_status.freq = dev->conf.channel->center_freq;
rx_status.band = dev->conf.channel->band; rx_status.band = dev->conf.channel->band;
rx_status.mactime = le64_to_cpu(entry->tsft); rx_status.mactime = le64_to_cpu(entry->tsft);
rx_status.flag |= RX_FLAG_TSFT; rx_status.flag |= RX_FLAG_MACTIME_MPDU;
if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR) if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
rx_status.flag |= RX_FLAG_FAILED_FCS_CRC; rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
......
...@@ -373,7 +373,7 @@ static void rtl8187_rx_cb(struct urb *urb) ...@@ -373,7 +373,7 @@ static void rtl8187_rx_cb(struct urb *urb)
rx_status.rate_idx = rate; rx_status.rate_idx = rate;
rx_status.freq = dev->conf.channel->center_freq; rx_status.freq = dev->conf.channel->center_freq;
rx_status.band = dev->conf.channel->band; rx_status.band = dev->conf.channel->band;
rx_status.flag |= RX_FLAG_TSFT; rx_status.flag |= RX_FLAG_MACTIME_MPDU;
if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR) if (flags & RTL818X_RX_DESC_FLAG_CRC32_ERR)
rx_status.flag |= RX_FLAG_FAILED_FCS_CRC; rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status)); memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
......
...@@ -691,7 +691,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, ...@@ -691,7 +691,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
if (GET_RX_DESC_RXHT(pdesc)) if (GET_RX_DESC_RXHT(pdesc))
rx_status->flag |= RX_FLAG_HT; rx_status->flag |= RX_FLAG_HT;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU;
if (stats->decrypted) if (stats->decrypted)
rx_status->flag |= RX_FLAG_DECRYPTED; rx_status->flag |= RX_FLAG_DECRYPTED;
......
...@@ -334,7 +334,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, ...@@ -334,7 +334,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
rx_status->flag |= RX_FLAG_40MHZ; rx_status->flag |= RX_FLAG_40MHZ;
if (GET_RX_DESC_RX_HT(pdesc)) if (GET_RX_DESC_RX_HT(pdesc))
rx_status->flag |= RX_FLAG_HT; rx_status->flag |= RX_FLAG_HT;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU;
if (stats->decrypted) if (stats->decrypted)
rx_status->flag |= RX_FLAG_DECRYPTED; rx_status->flag |= RX_FLAG_DECRYPTED;
rx_status->rate_idx = _rtl92c_rate_mapping(hw, rx_status->rate_idx = _rtl92c_rate_mapping(hw,
......
...@@ -81,7 +81,7 @@ static void wl1251_rx_status(struct wl1251 *wl, ...@@ -81,7 +81,7 @@ static void wl1251_rx_status(struct wl1251 *wl,
status->freq = ieee80211_channel_to_frequency(desc->channel, status->freq = ieee80211_channel_to_frequency(desc->channel,
status->band); status->band);
status->flag |= RX_FLAG_TSFT; status->flag |= RX_FLAG_MACTIME_MPDU;
if (desc->flags & RX_DESC_ENCRYPTION_MASK) { if (desc->flags & RX_DESC_ENCRYPTION_MASK) {
status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED; status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;
......
...@@ -6819,11 +6819,14 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p, ...@@ -6819,11 +6819,14 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
ratespec_t rspec; ratespec_t rspec;
unsigned char *plcp; unsigned char *plcp;
#if 0
/* Clearly, this is bogus -- reading the TSF now is wrong */
wlc_read_tsf(wlc, &tsf_l, &tsf_h); /* mactime */ wlc_read_tsf(wlc, &tsf_l, &tsf_h); /* mactime */
rx_status->mactime = tsf_h; rx_status->mactime = tsf_h;
rx_status->mactime <<= 32; rx_status->mactime <<= 32;
rx_status->mactime |= tsf_l; rx_status->mactime |= tsf_l;
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_MACTIME_MPDU; /* clearly wrong */
#endif
channel = WLC_CHAN_CHANNEL(rxh->RxChan); channel = WLC_CHAN_CHANNEL(rxh->RxChan);
......
...@@ -599,9 +599,10 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) ...@@ -599,9 +599,10 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
* the frame. * the frame.
* @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
* the frame. * the frame.
* @RX_FLAG_TSFT: The timestamp passed in the RX status (@mactime field) * @RX_FLAG_MACTIME_MPDU: The timestamp passed in the RX status (@mactime
* is valid. This is useful in monitor mode and necessary for beacon frames * field) is valid and contains the time the first symbol of the MPDU
* to enable IBSS merging. * was received. This is useful in monitor mode and for proper IBSS
* merging.
* @RX_FLAG_SHORTPRE: Short preamble was used for this frame * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
* @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
* @RX_FLAG_40MHZ: HT40 (40 MHz) was used * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
...@@ -614,7 +615,7 @@ enum mac80211_rx_flags { ...@@ -614,7 +615,7 @@ enum mac80211_rx_flags {
RX_FLAG_IV_STRIPPED = 1<<4, RX_FLAG_IV_STRIPPED = 1<<4,
RX_FLAG_FAILED_FCS_CRC = 1<<5, RX_FLAG_FAILED_FCS_CRC = 1<<5,
RX_FLAG_FAILED_PLCP_CRC = 1<<6, RX_FLAG_FAILED_PLCP_CRC = 1<<6,
RX_FLAG_TSFT = 1<<7, RX_FLAG_MACTIME_MPDU = 1<<7,
RX_FLAG_SHORTPRE = 1<<8, RX_FLAG_SHORTPRE = 1<<8,
RX_FLAG_HT = 1<<9, RX_FLAG_HT = 1<<9,
RX_FLAG_40MHZ = 1<<10, RX_FLAG_40MHZ = 1<<10,
......
...@@ -355,7 +355,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -355,7 +355,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
goto put_bss; goto put_bss;
if (rx_status->flag & RX_FLAG_TSFT) { if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
/* /*
* For correct IBSS merging we need mactime; since mactime is * For correct IBSS merging we need mactime; since mactime is
* defined as the time the first data symbol of the frame hits * defined as the time the first data symbol of the frame hits
......
...@@ -77,7 +77,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local, ...@@ -77,7 +77,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
/* always present fields */ /* always present fields */
len = sizeof(struct ieee80211_radiotap_header) + 9; len = sizeof(struct ieee80211_radiotap_header) + 9;
if (status->flag & RX_FLAG_TSFT) if (status->flag & RX_FLAG_MACTIME_MPDU)
len += 8; len += 8;
if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
len += 1; len += 1;
...@@ -123,7 +123,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, ...@@ -123,7 +123,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
/* the order of the following fields is important */ /* the order of the following fields is important */
/* IEEE80211_RADIOTAP_TSFT */ /* IEEE80211_RADIOTAP_TSFT */
if (status->flag & RX_FLAG_TSFT) { if (status->flag & RX_FLAG_MACTIME_MPDU) {
put_unaligned_le64(status->mactime, pos); put_unaligned_le64(status->mactime, pos);
rthdr->it_present |= rthdr->it_present |=
cpu_to_le32(1 << IEEE80211_RADIOTAP_TSFT); cpu_to_le32(1 << IEEE80211_RADIOTAP_TSFT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment