Module Name: src
Committed By: riastradh
Date: Wed Oct 11 18:19:43 UTC 2023
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc(4): `nvm_ver & ...' has type int, so use %x, not %hx.
This happens even though nvm_ver is unsigned short (uint16_t),
because of the integer promotions.
Should fix clang build.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/igc/if_igc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.4 src/sys/dev/pci/igc/if_igc.c:1.5
--- src/sys/dev/pci/igc/if_igc.c:1.4 Tue Oct 10 06:21:09 2023
+++ src/sys/dev/pci/igc/if_igc.c Wed Oct 11 18:19:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.4 2023/10/10 06:21:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.5 2023/10/11 18:19:43 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3842,7 +3842,7 @@ igc_print_devinfo(struct igc_softc *sc)
/* Get PHY FW version */
phy->ops.read_reg(hw, 0x1e, &phy_ver);
- aprint_normal_dev(dev, "ROM image version %x.%02hx",
+ aprint_normal_dev(dev, "ROM image version %x.%02x",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
(nvm_ver & NVM_VERSION_MINOR));
aprint_debug("(0x%04hx)", nvm_ver);
