diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-05 14:55:34 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-05 22:56:07 +0000 |
| commit | 2096c006aa33f1b49f601f8142fee6615fe2e7f0 (patch) | |
| tree | 2a7891201273a138a5057811f582fe703634f41e /caputils | |
| parent | 9a47bc58f7543a12d6fc59f4c92fd4e5de2c18ec (diff) | |
Get rid of ws80211_frequency_to_channel().
Use ieee80211_mhz_to_chan() instead.
Change-Id: I1d9a3b9c3a5ad2b1a5bd3f8d10b7f8b1bbcba51d
Reviewed-on: https://code.wireshark.org/review/11586
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/ws80211_utils.c | 16 | ||||
| -rw-r--r-- | caputils/ws80211_utils.h | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/caputils/ws80211_utils.c b/caputils/ws80211_utils.c index 590edc47d9..2db292bf9d 100644 --- a/caputils/ws80211_utils.c +++ b/caputils/ws80211_utils.c @@ -1188,22 +1188,6 @@ void ws80211_free_interfaces(GArray *interfaces) g_array_free(interfaces, TRUE); } -int ws80211_frequency_to_channel(int freq) -{ - if (freq == 2484) - return 14; - - if (freq < 2484) - return (freq - 2407) / 5; - - /* 4.9 GHz. https://en.wikipedia.org/wiki/List_of_WLAN_channels, fetched - * 2015-06-15 */ - if (freq < 5000) - return freq / 5 - 800; - - return freq / 5 - 1000; -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/caputils/ws80211_utils.h b/caputils/ws80211_utils.h index 4086f50431..da4ed42065 100644 --- a/caputils/ws80211_utils.h +++ b/caputils/ws80211_utils.h @@ -87,13 +87,6 @@ int ws80211_get_iface_info(const char *name, struct ws80211_iface_info *iface_in */ void ws80211_free_interfaces(GArray *interfaces); -/** Convert a frequency to a channel number - * - * @param freq Frequency in MHz. - * @return The 802.11 channel number matching the provided frequency. - */ -int ws80211_frequency_to_channel(int freq); - /** Set the frequency and channel width for an interface. * * @param name The interface name. |