| commit | eb76a720a5c695e876e75171add21c3787100ebd | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Tue Sep 17 17:39:52 2013 -0700 |
| committer | The Android Automerger <android-build@google.com> | Tue Sep 17 17:39:52 2013 -0700 |
| tree | 527b7410850693834d66865f0bde82a397704934 | |
| parent | 3bdda0eea1d423ad6feac810ceee94d75761d667 [diff] | |
| parent | e3b0dce889225eda34ecc6455eaeeaa5b12b4475 [diff] |
merge in klp-release history after reset to klp-dev
diff --git a/src/p2p/p2p_utils.c b/src/p2p/p2p_utils.c index 0769ede..e0d3756 100644 --- a/src/p2p/p2p_utils.c +++ b/src/p2p/p2p_utils.c
@@ -249,7 +249,8 @@ u8 op_reg_class, op_channel; #ifdef ANDROID_P2P - if (freq >= 5170 && freq < 5745) + if ((freq >= 5170 && freq < 5745) && + (os_strncasecmp(p2p->cfg->country, "US", 2) == 0)) return 0; #endif if (p2p_freq_to_channel(freq, &op_reg_class, &op_channel) < 0)