aboutsummaryrefslogtreecommitdiffstats
path: root/src/p2p/p2p_i.h
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-04-27 18:03:16 (GMT)
committerJouni Malinen <j@w1.fi>2013-04-27 19:12:13 (GMT)
commit9ccd916504502d4ad33649f9a2737853804690bf (patch)
tree7b8f0263a81e59be79e7494ffbeb16f5d7f7afd6 /src/p2p/p2p_i.h
parente864c0aefedd1765b45ef7f211828318bbde36cc (diff)
downloadhostap-9ccd916504502d4ad33649f9a2737853804690bf.zip
hostap-9ccd916504502d4ad33649f9a2737853804690bf.tar.gz
hostap-9ccd916504502d4ad33649f9a2737853804690bf.tar.bz2
P2P: Clean up channel--frequency conversion functions
All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/p2p/p2p_i.h')
-rw-r--r--src/p2p/p2p_i.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h
index c428c20..ea6c146 100644
--- a/src/p2p/p2p_i.h
+++ b/src/p2p/p2p_i.h
@@ -557,9 +557,8 @@ struct p2p_group_info {
/* p2p_utils.c */
int p2p_random(char *buf, size_t len);
-int p2p_channel_to_freq(const char *country, int reg_class, int channel);
-int p2p_freq_to_channel(const char *country, unsigned int freq, u8 *reg_class,
- u8 *channel);
+int p2p_channel_to_freq(int op_class, int channel);
+int p2p_freq_to_channel(unsigned int freq, u8 *op_class, u8 *channel);
void p2p_channels_intersect(const struct p2p_channels *a,
const struct p2p_channels *b,
struct p2p_channels *res);