浏览代码

ath10k: allow empty ssid vdev config

It doesn't make much sense to reject a valid
firmware configuration combination.

Since SSID isn't known early on it might make
sense to allow driver to start vdev without SSID
and restart it later.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Michal Kazior 10 年之前
父节点
当前提交
0a27347efd
共有 2 个文件被更改,包括 0 次插入4 次删除
  1. 0 2
      drivers/net/wireless/ath/ath10k/wmi-tlv.c
  2. 0 2
      drivers/net/wireless/ath/ath10k/wmi.c

+ 0 - 2
drivers/net/wireless/ath/ath10k/wmi-tlv.c

@@ -1518,8 +1518,6 @@ ath10k_wmi_tlv_op_gen_vdev_start(struct ath10k *ar,
 	void *ptr;
 	void *ptr;
 	u32 flags = 0;
 	u32 flags = 0;
 
 
-	if (WARN_ON(arg->ssid && arg->ssid_len == 0))
-		return ERR_PTR(-EINVAL);
 	if (WARN_ON(arg->hidden_ssid && !arg->ssid))
 	if (WARN_ON(arg->hidden_ssid && !arg->ssid))
 		return ERR_PTR(-EINVAL);
 		return ERR_PTR(-EINVAL);
 	if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))
 	if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))

+ 0 - 2
drivers/net/wireless/ath/ath10k/wmi.c

@@ -4248,8 +4248,6 @@ ath10k_wmi_op_gen_vdev_start(struct ath10k *ar,
 	const char *cmdname;
 	const char *cmdname;
 	u32 flags = 0;
 	u32 flags = 0;
 
 
-	if (WARN_ON(arg->ssid && arg->ssid_len == 0))
-		return ERR_PTR(-EINVAL);
 	if (WARN_ON(arg->hidden_ssid && !arg->ssid))
 	if (WARN_ON(arg->hidden_ssid && !arg->ssid))
 		return ERR_PTR(-EINVAL);
 		return ERR_PTR(-EINVAL);
 	if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))
 	if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid)))