diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-05-27 12:56:04 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-05-27 12:56:04 -0700 |
| commit | 76cd2cc44b62e858f1897ce58f4ce7d0174e8839 (patch) | |
| tree | e07cb52e06437f007881589991df87c61da50791 /src/p2p | |
| parent | 3c57b3f85a2d1d586b8b42014a806df23d309824 (diff) | |
| download | android_external_wpa_supplicant_8-76cd2cc44b62e858f1897ce58f4ce7d0174e8839.tar.gz android_external_wpa_supplicant_8-76cd2cc44b62e858f1897ce58f4ce7d0174e8839.tar.bz2 android_external_wpa_supplicant_8-76cd2cc44b62e858f1897ce58f4ce7d0174e8839.zip | |
Cumulative patch from commit 147848ec4d26613d5a117d4b35dbc7ff98dd65d1
147848e nl80211: Do not add all virtual interfaces to drv->if_indices
de88430 nl80211: Fix del_ifidx() with mixed parent interface cases
829a1b3 P2P: Clear p2p_auth_invite after each persistent group invitation
e403ba8 Parse DMG capabilities when reporting to external interfaces
f7454c9 P2P: Add 60 GHz in channel to frequency conversion
fc3f1d1 Remove unused hostapd_ip_diff()
7bb7090 Add DRIVER_EVENT AVOID_FREQUENCIES for testing
d73c7b9 GAS: Send error response if no room for pending dialog context
658d495 HS 2.0: Include OSU client sample in wpa_supplicant release package
Change-Id: Ie2109f25bd8de2c926d4116eed37b458ae6a6950
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p_utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/p2p/p2p_utils.c b/src/p2p/p2p_utils.c index 06cb646d..ac190644 100644 --- a/src/p2p/p2p_utils.c +++ b/src/p2p/p2p_utils.c @@ -98,6 +98,10 @@ int p2p_channel_to_freq(int op_class, int channel) if (channel < 36 || channel > 161) return -1; return 5000 + 5 * channel; + case 180: /* 60 GHz band, channels 1..4 */ + if (channel < 1 || channel > 4) + return -1; + return 56160 + 2160 * channel; } return -1; } |