summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pcidump
diff options
context:
space:
mode:
authormlarkin <mlarkin@openbsd.org>2017-03-25 07:33:46 +0000
committermlarkin <mlarkin@openbsd.org>2017-03-25 07:33:46 +0000
commit8e37be76140e4a33ad6f72170fc16c4d96b5f0d6 (patch)
tree1a902cd46626f9a1acec3e4676f56a369b2b0192 /usr.sbin/pcidump
parentmention Opteron A1100 systems (diff)
downloadwireguard-openbsd-8e37be76140e4a33ad6f72170fc16c4d96b5f0d6.tar.xz
wireguard-openbsd-8e37be76140e4a33ad6f72170fc16c4d96b5f0d6.zip
More PCI extended capabilities handling in pcidump.
From Simon Mages ok deraadt@
Diffstat (limited to 'usr.sbin/pcidump')
-rw-r--r--usr.sbin/pcidump/pcidump.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/pcidump/pcidump.c b/usr.sbin/pcidump/pcidump.c
index 73d9e7c24e9..2acd7b209df 100644
--- a/usr.sbin/pcidump/pcidump.c
+++ b/usr.sbin/pcidump/pcidump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcidump.c,v 1.42 2017/03/16 22:05:46 deraadt Exp $ */
+/* $OpenBSD: pcidump.c,v 1.43 2017/03/25 07:33:46 mlarkin Exp $ */
/*
* Copyright (c) 2006, 2007 David Gwynne <loki@animata.net>
@@ -392,6 +392,7 @@ void
dump_pcie_enhanced_caplist(int bus, int dev, int func)
{
u_int32_t reg;
+ u_int32_t capidx;
u_int16_t ptr;
u_int16_t ecap;
@@ -407,10 +408,12 @@ dump_pcie_enhanced_caplist(int bus, int dev, int func)
ecap = PCI_PCIE_ECAP_ID(reg);
if (ecap >= nitems(pci_enhanced_capnames))
- ecap = 0;
+ capidx = 0;
+ else
+ capidx = ecap;
printf("\t0x%04x: Enhanced Capability 0x%02x: ", ptr, ecap);
- printf("%s\n", pci_enhanced_capnames[ecap]);
+ printf("%s\n", pci_enhanced_capnames[capidx]);
ptr = PCI_PCIE_ECAP_NEXT(reg);