| Revision | b4a8f050239a69250806f458ac9ede41b2077aff (tree) |
|---|---|
| Time | 2018-01-04 17:36:06 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-7.1.2_r36' into nougat-x86
Android 7.1.2 Release 36 (N2G48H)
bcmdhd/firmware/bcm4354/fw_bcm4354.bin (diff) bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin (diff) bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin (diff) bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin (diff) bcmdhd/firmware/bcm4358/fw_bcm4358.bin (diff) bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin (diff)
bcmdhd/wifi_hal/gscan.cpp (diff)| @@ -1436,30 +1436,38 @@ public: | ||
| 1436 | 1436 | if (result < 0) { |
| 1437 | 1437 | return result; |
| 1438 | 1438 | } |
| 1439 | - | |
| 1440 | - struct nlattr * attr = request.attr_start(GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS); | |
| 1441 | - | |
| 1442 | - for (int i = 0; i < mParams.num_bssid; i++) { | |
| 1443 | - nlattr *attr2 = request.attr_start(i); | |
| 1444 | - if (attr2 == NULL) { | |
| 1439 | + result = request.put_u16(GSCAN_ATTRIBUTE_NUM_BSSID, mParams.num_bssid); | |
| 1440 | + if (result < 0) { | |
| 1441 | + return result; | |
| 1442 | + } | |
| 1443 | + if (mParams.num_bssid != 0) { | |
| 1444 | + nlattr* attr = request.attr_start(GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS); | |
| 1445 | + if (attr == NULL) { | |
| 1445 | 1446 | return WIFI_ERROR_OUT_OF_MEMORY; |
| 1446 | 1447 | } |
| 1447 | - result = request.put_addr(GSCAN_ATTRIBUTE_BSSID, mParams.ap[i].bssid); | |
| 1448 | - if (result < 0) { | |
| 1449 | - return result; | |
| 1450 | - } | |
| 1451 | - result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_HIGH, mParams.ap[i].high); | |
| 1452 | - if (result < 0) { | |
| 1453 | - return result; | |
| 1454 | - } | |
| 1455 | - result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_LOW, mParams.ap[i].low); | |
| 1456 | - if (result < 0) { | |
| 1457 | - return result; | |
| 1448 | + | |
| 1449 | + for (int i = 0; i < mParams.num_bssid; i++) { | |
| 1450 | + nlattr* attr2 = request.attr_start(i); | |
| 1451 | + if (attr2 == NULL) { | |
| 1452 | + return WIFI_ERROR_OUT_OF_MEMORY; | |
| 1453 | + } | |
| 1454 | + result = request.put_addr(GSCAN_ATTRIBUTE_BSSID, mParams.ap[i].bssid); | |
| 1455 | + if (result < 0) { | |
| 1456 | + return result; | |
| 1457 | + } | |
| 1458 | + result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_HIGH, mParams.ap[i].high); | |
| 1459 | + if (result < 0) { | |
| 1460 | + return result; | |
| 1461 | + } | |
| 1462 | + result = request.put_u8(GSCAN_ATTRIBUTE_RSSI_LOW, mParams.ap[i].low); | |
| 1463 | + if (result < 0) { | |
| 1464 | + return result; | |
| 1465 | + } | |
| 1466 | + request.attr_end(attr2); | |
| 1458 | 1467 | } |
| 1459 | - request.attr_end(attr2); | |
| 1460 | - } | |
| 1461 | 1468 | |
| 1462 | - request.attr_end(attr); | |
| 1469 | + request.attr_end(attr); | |
| 1470 | + } | |
| 1463 | 1471 | request.attr_end(data); |
| 1464 | 1472 | |
| 1465 | 1473 | return result; |
Android-x86
Fork