소스 검색

qcacmn: Make ndp channel config parameter optional

The ndp channel config has no meaning if ndp channel itself
is optional. Host will send ndp channel config as "optional"
to FW if it is missing in the ndp command.

Change-Id: I59e245f3fb05ae35aa185fba7bad09608f5334c8
CRs-Fixed: 2072502
Naveen Rawat 7 년 전
부모
커밋
25b1887267
1개의 변경된 파일9개의 추가작업 그리고 8개의 파일을 삭제
  1. 9 8
      src/os_if_nan.c

+ 9 - 8
src/os_if_nan.c

@@ -296,16 +296,17 @@ static int os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc,
 	req.transaction_id =
 		nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]);
 
-	if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL])
+	if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]) {
 		req.channel = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]);
 
-	if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]) {
-		req.channel_cfg =
-		    nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]);
-	} else {
-		cfg80211_err("Channel config is unavailable");
-		ret = -EINVAL;
-		goto initiator_req_failed;
+		if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]) {
+			req.channel_cfg = nla_get_u32(
+				tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]);
+		} else {
+			cfg80211_err("Channel config is unavailable");
+			ret = -EINVAL;
+			goto initiator_req_failed;
+		}
 	}
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]) {