diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
tree | 29932718192962671c48c3fd1ea017a6112459e8 /net/mac80211/ieee80211_i.h | |
parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 432011cd364..884be4d100f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -853,7 +853,29 @@ u32 ieee80211_handle_ht(struct ieee80211_local *local, int enable_ht, | |||
853 | 853 | ||
854 | /* ieee80211_ioctl.c */ | 854 | /* ieee80211_ioctl.c */ |
855 | extern const struct iw_handler_def ieee80211_iw_handler_def; | 855 | extern const struct iw_handler_def ieee80211_iw_handler_def; |
856 | int ieee80211_set_freq(struct ieee80211_local *local, int freq); | 856 | |
857 | /* Least common multiple of the used rates (in 100 kbps). This is used to | ||
858 | * calculate rate_inv values for each rate so that only integers are needed. */ | ||
859 | #define CHAN_UTIL_RATE_LCM 95040 | ||
860 | /* 1 usec is 1/8 * (95040/10) = 1188 */ | ||
861 | #define CHAN_UTIL_PER_USEC 1188 | ||
862 | /* Amount of bits to shift the result right to scale the total utilization | ||
863 | * to values that will not wrap around 32-bit integers. */ | ||
864 | #define CHAN_UTIL_SHIFT 9 | ||
865 | /* Theoretical maximum of channel utilization counter in 10 ms (stat_time=1): | ||
866 | * (CHAN_UTIL_PER_USEC * 10000) >> CHAN_UTIL_SHIFT = 23203. So dividing the | ||
867 | * raw value with about 23 should give utilization in 10th of a percentage | ||
868 | * (1/1000). However, utilization is only estimated and not all intervals | ||
869 | * between frames etc. are calculated. 18 seems to give numbers that are closer | ||
870 | * to the real maximum. */ | ||
871 | #define CHAN_UTIL_PER_10MS 18 | ||
872 | #define CHAN_UTIL_HDR_LONG (202 * CHAN_UTIL_PER_USEC) | ||
873 | #define CHAN_UTIL_HDR_SHORT (40 * CHAN_UTIL_PER_USEC) | ||
874 | |||
875 | |||
876 | /* ieee80211_ioctl.c */ | ||
877 | int ieee80211_set_freq(struct net_device *dev, int freq); | ||
878 | |||
857 | /* ieee80211_sta.c */ | 879 | /* ieee80211_sta.c */ |
858 | void ieee80211_sta_timer(unsigned long data); | 880 | void ieee80211_sta_timer(unsigned long data); |
859 | void ieee80211_sta_work(struct work_struct *work); | 881 | void ieee80211_sta_work(struct work_struct *work); |