github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: ieee80211: remove ieee80211_next_tbtt_present()

Browse Source 
This is actually completely equivalent to the other function
ieee80211_is_s1g_short_beacon(), but open-codes the logic.
Implement the necessary logic in ieee80211_is_s1g_short_beacon()
and remove ieee80211_next_tbtt_present().

Link: https://msgid.link/20240515093852.774ced74dea8.I152525b4cff6e6a25be6c48fe6a4b89f17bab8a9@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-05-15 09:38:38 +02:00
parent 1c26f09b20
commit 5485687129
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/ieee80211.h
View File

@ -604,25 +604,15 @@ static inline bool ieee80211_is_s1g_beacon(__le16 fc)
}
/**
* ieee80211_next_tbtt_present - check if IEEE80211_FTYPE_EXT &&
* IEEE80211_STYPE_S1G_BEACON && IEEE80211_S1G_BCN_NEXT_TBTT
* @fc: frame control bytes in little-endian byteorder
*/
static inline bool ieee80211_next_tbtt_present(__le16 fc)
{
return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==
cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON) &&
fc & cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT);
}
/**
* ieee80211_is_s1g_short_beacon - check if next tbtt present bit is set. Only
* true for S1G beacons when they're short.
* ieee80211_is_s1g_short_beacon - check if frame is an S1G short beacon
* @fc: frame control bytes in little-endian byteorder
* Return: whether or not the frame is an S1G short beacon,
* i.e. it is an S1G beacon with 'next TBTT' flag set
*/
static inline bool ieee80211_is_s1g_short_beacon(__le16 fc)
{
return ieee80211_is_s1g_beacon(fc) && ieee80211_next_tbtt_present(fc);
return ieee80211_is_s1g_beacon(fc) &&
(fc & cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT));
}
/**