Commit b5725101 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by Johannes Berg
Browse files

ieee80211: share 802.11 unit conversion helpers 



MHZ_TO_KHZ, and KHZ_TO_MHZ are useful to drivers and
elsewhere so export these in the common ieee80211 header.
Move the power helpers also because we might as well.

Signed-off-by: default avatarThomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200402011810.22947-2-thomas@adapt-ip.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent bdee75d2

include/linux/ieee80211.h

+10 −0
Original line number Diff line number Diff line
@@ -3330,6 +3330,16 @@ static inline int ieee80211_get_tdls_action(struct sk_buff *skb, u32 hdr_size) 
#define TU_TO_JIFFIES(x)	(usecs_to_jiffies((x) * 1024))

#define TU_TO_EXP_TIME(x)	(jiffies + TU_TO_JIFFIES(x))



/* convert frequencies */

#define MHZ_TO_KHZ(freq) ((freq) * 1000)

#define KHZ_TO_MHZ(freq) ((freq) / 1000)



/* convert powers */

#define DBI_TO_MBI(gain) ((gain) * 100)

#define MBI_TO_DBI(gain) ((gain) / 100)

#define DBM_TO_MBM(gain) ((gain) * 100)

#define MBM_TO_DBM(gain) ((gain) / 100)



/**

 * ieee80211_action_contains_tpc - checks if the frame contains TPC element

 * @skb: the skb containing the frame, length will be checked

include/net/regulatory.h

+0 −7
Original line number Diff line number Diff line
@@ -231,13 +231,6 @@ struct ieee80211_regdomain { 
	struct ieee80211_reg_rule reg_rules[];

};



#define MHZ_TO_KHZ(freq) ((freq) * 1000)

#define KHZ_TO_MHZ(freq) ((freq) / 1000)

#define DBI_TO_MBI(gain) ((gain) * 100)

#define MBI_TO_DBI(gain) ((gain) / 100)

#define DBM_TO_MBM(gain) ((gain) * 100)

#define MBM_TO_DBM(gain) ((gain) / 100)



#define REG_RULE_EXT(start, end, bw, gain, eirp, dfs_cac, reg_flags)	\

{									\

	.freq_range.start_freq_khz = MHZ_TO_KHZ(start),			\

CRA Git | Maintained and supported by SUSTech CRA and CCSE