From: Jaya Prakash Sangaru Date: Wed, 17 Apr 2019 10:08:48 +0000 (+0530) Subject: [NEUS7920-218] [9610][7885] wlbt: NAN binding mask update X-Git-Tag: MMI-QSAS30.62-33-3~923 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bbb9d1dc46d0a9a801b9ec85152229c8ef843a0f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [NEUS7920-218] [9610][7885] wlbt: NAN binding mask update Binding mask is 4 byte. Change-Id: I38b0eeee394823f91cf6de505d9ad4023f25aa85 SCSC-Bug-Id: SSB-51851 Signed-off-by: Jaya Prakash Sangaru --- diff --git a/drivers/net/wireless/scsc/mlme.c b/drivers/net/wireless/scsc/mlme.c index 770ca3743232..156f11be0860 100755 --- a/drivers/net/wireless/scsc/mlme.c +++ b/drivers/net/wireless/scsc/mlme.c @@ -4490,6 +4490,7 @@ static void slsi_mlme_nan_publish_fapi_data(struct sk_buff *req, struct slsi_hal u8 nan_publish_fields_header[] = {0xdd, 0x00, 0x00, 0x16, 0x32, 0x0b, 0x02}; u8 *header_ptr, *end_ptr; __le16 le16val; + u32 binding_mask = 0; header_ptr = fapi_append_data(req, nan_publish_fields_header, sizeof(nan_publish_fields_header)); le16val = cpu_to_le16(hal_req->ttl); @@ -4501,8 +4502,8 @@ static void slsi_mlme_nan_publish_fapi_data(struct sk_buff *req, struct slsi_hal fapi_append_data(req, &hal_req->publish_count, 1); fapi_append_data(req, &hal_req->publish_match_indicator, 1); fapi_append_data(req, &hal_req->rssi_threshold_flag, 1); - end_ptr = fapi_append_data(req, &hal_req->connmap, 1); - end_ptr += 1; + end_ptr = fapi_append_data(req, (u8 *)&binding_mask, 4); + end_ptr += 4; if (hal_req->service_name_len) slsi_mlme_nan_append_tlv(req, cpu_to_le16 (SLSI_FAPI_NAN_SERVICE_NAME), @@ -4596,6 +4597,7 @@ static void slsi_mlme_nan_subscribe_fapi_data(struct sk_buff *req, struct slsi_h u8 nan_subscribe_fields_header[] = {0xdd, 0x00, 0x00, 0x16, 0x32, 0x0b, 0x03}; u8 *header_ptr, *end_ptr; __le16 le16val; + u32 binding_mask = 0; header_ptr = fapi_append_data(req, nan_subscribe_fields_header, sizeof(nan_subscribe_fields_header)); le16val = cpu_to_le16(hal_req->ttl); @@ -4610,8 +4612,8 @@ static void slsi_mlme_nan_subscribe_fapi_data(struct sk_buff *req, struct slsi_h fapi_append_data(req, &hal_req->subscribe_match_indicator, 1); fapi_append_data(req, &hal_req->subscribe_count, 1); fapi_append_data(req, &hal_req->rssi_threshold_flag, 1); - end_ptr = fapi_append_data(req, &hal_req->connmap, 1); - end_ptr += 1; + end_ptr = fapi_append_data(req, (u8 *)&binding_mask, 4); + end_ptr += 4; if (hal_req->service_name_len) slsi_mlme_nan_append_tlv(req, cpu_to_le16 (SLSI_FAPI_NAN_SERVICE_NAME),