diff options
| author | Hsiu-Chang Chen <hsiuchangchen@google.com> | 2023-05-17 08:09:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-17 08:09:34 +0000 |
| commit | d3fc84256160c28f25d22010aed519633f10eb58 (patch) | |
| tree | d98ca39e3daae138f8d9f9413adcef0d60866d25 | |
| parent | 2c587fc2b691644fc22e62d0dd6555c6551b732a (diff) | |
| parent | 57b87486133ed9baa03e28cee1a0164e47543275 (diff) | |
| download | wlan-d3fc84256160c28f25d22010aed519633f10eb58.tar.gz | |
wifihal: Mask pub_sub_id to single byte am: 57b8748613
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23236337
Change-Id: I11293aaed3cac2214991e7120714694d843ac378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | legacy/qcwcn/wifi_hal/nan_req.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/legacy/qcwcn/wifi_hal/nan_req.cpp b/legacy/qcwcn/wifi_hal/nan_req.cpp index 265e39a..d92e118 100644 --- a/legacy/qcwcn/wifi_hal/nan_req.cpp +++ b/legacy/qcwcn/wifi_hal/nan_req.cpp @@ -788,7 +788,7 @@ wifi_error NanCommand::putNanPublish(transaction_id id, const NanPublishRequest if (pReq->publish_id == 0) { pFwReq->fwHeader.handle = 0xFFFF; } else { - pFwReq->fwHeader.handle = pReq->publish_id; + pFwReq->fwHeader.handle = (pReq->publish_id & 0xFF); } pFwReq->fwHeader.transactionId = id; @@ -992,7 +992,7 @@ wifi_error NanCommand::putNanPublishCancel(transaction_id id, const NanPublishCa pFwReq->fwHeader.msgVersion = (u16)NAN_MSG_VERSION1; pFwReq->fwHeader.msgId = NAN_MSG_ID_PUBLISH_SERVICE_CANCEL_REQ; pFwReq->fwHeader.msgLen = message_len; - pFwReq->fwHeader.handle = pReq->publish_id; + pFwReq->fwHeader.handle = (pReq->publish_id & 0xFF); pFwReq->fwHeader.transactionId = id; mVendorData = (char *)pFwReq; @@ -1085,7 +1085,7 @@ wifi_error NanCommand::putNanSubscribe(transaction_id id, if (pReq->subscribe_id == 0) { pFwReq->fwHeader.handle = 0xFFFF; } else { - pFwReq->fwHeader.handle = pReq->subscribe_id; + pFwReq->fwHeader.handle = (pReq->subscribe_id & 0xFF); } pFwReq->fwHeader.transactionId = id; @@ -1291,7 +1291,7 @@ wifi_error NanCommand::putNanSubscribeCancel(transaction_id id, pFwReq->fwHeader.msgVersion = (u16)NAN_MSG_VERSION1; pFwReq->fwHeader.msgId = NAN_MSG_ID_SUBSCRIBE_SERVICE_CANCEL_REQ; pFwReq->fwHeader.msgLen = message_len; - pFwReq->fwHeader.handle = pReq->subscribe_id; + pFwReq->fwHeader.handle = (pReq->subscribe_id & 0xFF); pFwReq->fwHeader.transactionId = id; mVendorData = (char *)pFwReq; @@ -1355,7 +1355,7 @@ wifi_error NanCommand::putNanTransmitFollowup(transaction_id id, pFwReq->fwHeader.msgVersion = (u16)NAN_MSG_VERSION1; pFwReq->fwHeader.msgId = NAN_MSG_ID_TRANSMIT_FOLLOWUP_REQ; pFwReq->fwHeader.msgLen = message_len; - pFwReq->fwHeader.handle = pReq->publish_subscribe_id; + pFwReq->fwHeader.handle = (pReq->publish_subscribe_id & 0xFF); pFwReq->fwHeader.transactionId = id; pFwReq->transmitFollowupReqParams.matchHandle = pReq->requestor_instance_id; |