diff for duplicates of <87wp1eaiz0.fsf@kamboji.qca.qualcomm.com> diff --git a/a/1.txt b/N1/1.txt index 62152b6..d0d2b00 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,24 +41,25 @@ only need 1) anymore. > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c -> @@ -1663,9 +1663,19 @@ static int ath10k_init_hw_params(struct ath10k *ar) -> for (i = 0; i < ARRAY_SIZE(ath10k_hw_params_list); i++) { -> hw_params = &ath10k_hw_params_list[i]; -> -> - if (hw_params->id == ar->target_version && -> - hw_params->dev_id == ar->dev_id) +> @@ -1663,9 +1663,19 @@ static int ath10k_init_hw_params(struct ath10k *ar= +) +> for (i =3D 0; i < ARRAY_SIZE(ath10k_hw_params_list); i++) { +> hw_params =3D &ath10k_hw_params_list[i]; +> =20 +> - if (hw_params->id =3D=3D ar->target_version && +> - hw_params->dev_id =3D=3D ar->dev_id) > - break; > + if (ar->is_high_latency) { > + /* High latency devices will use different fw depending > + * on if it is a USB or SDIO device. > + */ -> + if (hw_params->bus == ar->hif.bus && -> + hw_params->id == ar->target_version && -> + hw_params->dev_id == ar->dev_id) +> + if (hw_params->bus =3D=3D ar->hif.bus && +> + hw_params->id =3D=3D ar->target_version && +> + hw_params->dev_id =3D=3D ar->dev_id) > + break; > + } else { -> + if (hw_params->id == ar->target_version && -> + hw_params->dev_id == ar->dev_id) +> + if (hw_params->id =3D=3D ar->target_version && +> + hw_params->dev_id =3D=3D ar->dev_id) > + break; > + } @@ -91,9 +92,5 @@ AHB, I think all the rest is PCI. Or do we have AHB devices supported? Please move the bus field between dev_id and name fields. It's so important that it should not be in the end. --- -Kalle Valo -_______________________________________________ -ath10k mailing list -ath10k@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/ath10k +--=20 +Kalle Valo= diff --git a/a/content_digest b/N1/content_digest index 0d0364b..7522d05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -51,24 +51,25 @@ "\n" "> --- a/drivers/net/wireless/ath/ath10k/core.c\n" "> +++ b/drivers/net/wireless/ath/ath10k/core.c\n" - "> @@ -1663,9 +1663,19 @@ static int ath10k_init_hw_params(struct ath10k *ar)\n" - "> \tfor (i = 0; i < ARRAY_SIZE(ath10k_hw_params_list); i++) {\n" - "> \t\thw_params = &ath10k_hw_params_list[i];\n" - "> \n" - "> -\t\tif (hw_params->id == ar->target_version &&\n" - "> -\t\t hw_params->dev_id == ar->dev_id)\n" + "> @@ -1663,9 +1663,19 @@ static int ath10k_init_hw_params(struct ath10k *ar=\n" + ")\n" + "> \tfor (i =3D 0; i < ARRAY_SIZE(ath10k_hw_params_list); i++) {\n" + "> \t\thw_params =3D &ath10k_hw_params_list[i];\n" + "> =20\n" + "> -\t\tif (hw_params->id =3D=3D ar->target_version &&\n" + "> -\t\t hw_params->dev_id =3D=3D ar->dev_id)\n" "> -\t\t\tbreak;\n" "> +\t\tif (ar->is_high_latency) {\n" "> +\t\t\t/* High latency devices will use different fw depending\n" "> +\t\t\t * on if it is a USB or SDIO device.\n" "> +\t\t\t */\n" - "> +\t\t\tif (hw_params->bus == ar->hif.bus &&\n" - "> +\t\t\t hw_params->id == ar->target_version &&\n" - "> +\t\t\t hw_params->dev_id == ar->dev_id)\n" + "> +\t\t\tif (hw_params->bus =3D=3D ar->hif.bus &&\n" + "> +\t\t\t hw_params->id =3D=3D ar->target_version &&\n" + "> +\t\t\t hw_params->dev_id =3D=3D ar->dev_id)\n" "> +\t\t\t\tbreak;\n" "> +\t\t} else {\n" - "> +\t\t\tif (hw_params->id == ar->target_version &&\n" - "> +\t\t\t hw_params->dev_id == ar->dev_id)\n" + "> +\t\t\tif (hw_params->id =3D=3D ar->target_version &&\n" + "> +\t\t\t hw_params->dev_id =3D=3D ar->dev_id)\n" "> +\t\t\t\tbreak;\n" "> +\t\t}\n" "\n" @@ -101,11 +102,7 @@ "Please move the bus field between dev_id and name fields. It's so\n" "important that it should not be in the end.\n" "\n" - "-- \n" - "Kalle Valo\n" - "_______________________________________________\n" - "ath10k mailing list\n" - "ath10k@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/ath10k + "--=20\n" + Kalle Valo= -42b99575ee149fea6c51aeec7fa2c2b43c87e98e85e81b298c1a42d023307ef7 +6420c6046ab2278ee40638af97bc9dc5ba366377a45ca72245f13dc1a8d76f4a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.