| Message ID | 20231230045105.91351-2-sergeantsagara@protonmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: b43: Various QoS-related fixes | expand |
On Sat, 30 Dec 2023 04:51:29 +0000 Rahul Rameshbabu <sergeantsagara@protonmail.com> wrote: > Trigger the warning message should be when the OpenFW capability for QoS > does not advertise QoS support. Previously, the warning would be > incorrectly triggered when OpenFW reported QoS capability is present. > --- a/drivers/net/wireless/broadcom/b43/main.c > +++ b/drivers/net/wireless/broadcom/b43/main.c > @@ -2713,7 +2713,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) > dev->hwcrypto_enabled = false; > } > /* adding QoS support should use an offline discovery mechanism */ > - WARN(fwcapa & B43_FWCAPA_QOS, "QoS in OpenFW not supported\n"); > + WARN(!(fwcapa & B43_FWCAPA_QOS), "QoS in OpenFW not supported\n"); > } else { > b43info(dev->wl, "Loading firmware version %u.%u " > "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n", I don't think this patch is correct. It should warn, if the firmware advertises QoS, because that is not supported by b43 in case of OpenFW.
diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c index 92ca0b2ca286..c81117a22ebf 100644 --- a/drivers/net/wireless/broadcom/b43/main.c +++ b/drivers/net/wireless/broadcom/b43/main.c @@ -2713,7 +2713,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) dev->hwcrypto_enabled = false; } /* adding QoS support should use an offline discovery mechanism */ - WARN(fwcapa & B43_FWCAPA_QOS, "QoS in OpenFW not supported\n"); + WARN(!(fwcapa & B43_FWCAPA_QOS), "QoS in OpenFW not supported\n"); } else { b43info(dev->wl, "Loading firmware version %u.%u " "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n",
Trigger the warning message should be when the OpenFW capability for QoS does not advertise QoS support. Previously, the warning would be incorrectly triggered when OpenFW reported QoS capability is present. Fixes: 097b0e1bf18a ("b43: fix crash with OpenFWWF") Signed-off-by: Rahul Rameshbabu <sergeantsagara@protonmail.com> --- drivers/net/wireless/broadcom/b43/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)