Commit 9a727a25 authored by John W. Linville's avatar John W. Linville
Browse files

net/mac80211/ieee80211_i.h: fix-up merge damage 



These definitions were originally removed in "mac80211: remove channel
use statistics".

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cb14cb79

net/mac80211/ieee80211_i.h

+0 −21
Original line number Diff line number Diff line
@@ -853,27 +853,6 @@ u32 ieee80211_handle_ht(struct ieee80211_local *local, int enable_ht, 


/* ieee80211_ioctl.c */

extern const struct iw_handler_def ieee80211_iw_handler_def;



/* Least common multiple of the used rates (in 100 kbps). This is used to

 * calculate rate_inv values for each rate so that only integers are needed. */

#define CHAN_UTIL_RATE_LCM 95040

/* 1 usec is 1/8 * (95040/10) = 1188 */

#define CHAN_UTIL_PER_USEC 1188

/* Amount of bits to shift the result right to scale the total utilization

 * to values that will not wrap around 32-bit integers. */

#define CHAN_UTIL_SHIFT 9

/* Theoretical maximum of channel utilization counter in 10 ms (stat_time=1):

 * (CHAN_UTIL_PER_USEC * 10000) >> CHAN_UTIL_SHIFT = 23203. So dividing the

 * raw value with about 23 should give utilization in 10th of a percentage

 * (1/1000). However, utilization is only estimated and not all intervals

 * between frames etc. are calculated. 18 seems to give numbers that are closer

 * to the real maximum. */

#define CHAN_UTIL_PER_10MS 18

#define CHAN_UTIL_HDR_LONG (202 * CHAN_UTIL_PER_USEC)

#define CHAN_UTIL_HDR_SHORT (40 * CHAN_UTIL_PER_USEC)





/* ieee80211_ioctl.c */

int ieee80211_set_freq(struct net_device *dev, int freq);



/* ieee80211_sta.c */