On Sat, 16 Nov 2019 at 19:08:05 +0100, Stefan Sperling wrote:
> On Sat, Nov 16, 2019 at 11:44:03AM -0600, joshua stein wrote:
> > Awesome, thanks guys. It's working great on the 9560 on my ThinkPad
> > X1C7. A speed test showed 44/18 Mbps and it continues to work fine
> > after an S3 cycle.
>
> Great :-)
>
> > The firmware version string looks odd:
> >
> > iwm0 at pci0 dev 20 function 3 "Intel Dual Band Wireless AC 9560" rev 0x11,
> > msi
> > iwm0: hw rev 0x310, fw ver 34.-1169155311.0, address 90:78:41:39:57:8d
>
> I don't know yet what's up with that. Also happens on -17 firmware.
> The number we show for -34 firmware on 8260 looks OK though.
This fixes it and matches what Linux prints:
iwm0: hw rev 0x310, fw ver 34.3125811985.0, address 90:78:41:39:57:8d
iwlwifi 0000:00:14.3: loaded firmware version 34.3125811985.0 op_mode iwlmvm
diff --git sys/dev/pci/if_iwm.c sys/dev/pci/if_iwm.c
index 74475da5e58..f6e7c36374c 100644
--- sys/dev/pci/if_iwm.c
+++ sys/dev/pci/if_iwm.c
@@ -856,7 +856,7 @@ iwm_read_firmware(struct iwm_softc *sc, enum iwm_ucode_type
ucode_type)
goto parse_out;
}
snprintf(sc->sc_fwver, sizeof(sc->sc_fwver),
- "%d.%d.%d",
+ "%u.%u.%u",
le32toh(((uint32_t *)tlv_data)[0]),
le32toh(((uint32_t *)tlv_data)[1]),
le32toh(((uint32_t *)tlv_data)[2]));
