From 6e778a7efdc0e804471750157f6bacd1ef7d1580 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 8 Dec 2017 15:57:29 +0000
Subject: [PATCH] SPDX: license IDs for some ISC-related files.

---
 include/arpa/inet.h                                | 2 +-
 include/arpa/nameser.h                             | 6 +++---
 include/ftw.h                                      | 4 +++-
 include/hesiod.h                                   | 2 +-
 include/netdb.h                                    | 2 +-
 include/readpassphrase.h                           | 4 +++-
 include/res_update.h                               | 4 +++-
 include/resolv.h                                   | 2 +-
 include/unwind.h                                   | 6 +++++-
 include/wchar.h                                    | 2 +-
 lib/libc/include/isc/eventlib.h                    | 4 +++-
 lib/libc/include/isc/list.h                        | 4 +++-
 lib/libc/include/isc/platform.h                    | 4 +++-
 lib/libc/inet/inet_addr.c                          | 2 +-
 lib/libc/inet/inet_cidr_ntop.c                     | 4 +++-
 lib/libc/inet/inet_cidr_pton.c                     | 4 +++-
 lib/libc/inet/inet_net_ntop.c                      | 4 +++-
 lib/libc/inet/inet_net_pton.c                      | 4 +++-
 lib/libc/inet/inet_neta.c                          | 4 +++-
 lib/libc/inet/inet_ntop.c                          | 4 +++-
 lib/libc/inet/inet_pton.c                          | 4 +++-
 lib/libc/inet/nsap_addr.c                          | 4 +++-
 lib/libc/nameser/ns_name.c                         | 4 +++-
 lib/libc/nameser/ns_netint.c                       | 4 +++-
 lib/libc/nameser/ns_parse.c                        | 4 +++-
 lib/libc/nameser/ns_print.c                        | 4 +++-
 lib/libc/nameser/ns_samedomain.c                   | 4 +++-
 lib/libc/nameser/ns_ttl.c                          | 4 +++-
 lib/libc/resolv/herror.c                           | 2 +-
 lib/libc/resolv/res_comp.c                         | 2 +-
 lib/libc/resolv/res_data.c                         | 4 +++-
 lib/libc/resolv/res_debug.c                        | 6 +++---
 lib/libc/resolv/res_debug.h                        | 6 +++++-
 lib/libc/resolv/res_findzonecut.c                  | 4 +++-
 lib/libc/resolv/res_init.c                         | 2 +-
 lib/libc/resolv/res_mkquery.c                      | 6 +++---
 lib/libc/resolv/res_mkupdate.c                     | 4 +++-
 lib/libc/resolv/res_query.c                        | 2 +-
 lib/libc/resolv/res_send.c                         | 2 +-
 lib/libc/resolv/res_update.c                       | 4 +++-
 sys/dev/ath/ath_hal/ah.c                           | 4 +++-
 sys/dev/ath/ath_hal/ah.h                           | 4 +++-
 sys/dev/ath/ath_hal/ah_btcoex.h                    | 4 +++-
 sys/dev/ath/ath_hal/ah_debug.h                     | 4 +++-
 sys/dev/ath/ath_hal/ah_decode.h                    | 4 +++-
 sys/dev/ath/ath_hal/ah_desc.h                      | 4 +++-
 sys/dev/ath/ath_hal/ah_devid.h                     | 4 +++-
 sys/dev/ath/ath_hal/ah_diagcodes.h                 | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom.h                    | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_9287.c               | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_9287.h               | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v1.c                 | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v1.h                 | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v14.c                | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v14.h                | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v3.c                 | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v3.h                 | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v4k.c                | 4 +++-
 sys/dev/ath/ath_hal/ah_eeprom_v4k.h                | 4 +++-
 sys/dev/ath/ath_hal/ah_internal.h                  | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain.c                 | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain.h                 | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h      | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h   | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h   | 4 +++-
 sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h    | 4 +++-
 sys/dev/ath/ath_hal/ah_soc.h                       | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210.h                | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c     | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c       | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_misc.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_phy.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_power.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_recv.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210desc.h            | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5210/ar5210reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211.h                | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c     | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c       | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_misc.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_phy.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_power.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_recv.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211desc.h            | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5211/ar5211reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar2316.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar2317.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar2413.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar2425.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5111.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5112.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212.h                | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_ani.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c     | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c       | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_misc.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_phy.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_power.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_recv.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212desc.h            | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5212reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5311reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5212/ar5413.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312.h                | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c     | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_misc.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_power.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5312reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar2133.c                | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416.h                | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_ani.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_cal.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_cal.h            | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c      | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c    | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c         | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c     | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c       | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_misc.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_phy.c            | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_power.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_radar.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_recv.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c       | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c           | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416desc.h            | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar5416/ar5416reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h         | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130_phy.c            | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130_phy.h            | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9130reg.h             | 4 +++-
 sys/dev/ath/ath_hal/ar9001/ar9160_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9280.c                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9280.h                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9280_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285.c                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285.h                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9285an.h              | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287.c                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287.h                | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287_attach.c         | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287_olc.h            | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287_reset.c          | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287_reset.h          | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287an.h              | 4 +++-
 sys/dev/ath/ath_hal/ar9002/ar9287phy.h             | 4 +++-
 sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h         | 4 +++-
 sys/dev/bhnd/bcma/bcma.c                           | 2 ++
 sys/dev/bhnd/bcma/bcma.h                           | 2 ++
 sys/dev/bhnd/bcma/bcma_bhndb.c                     | 2 ++
 sys/dev/bhnd/bcma/bcma_dmp.h                       | 2 ++
 sys/dev/bhnd/bcma/bcma_erom.c                      | 2 ++
 sys/dev/bhnd/bcma/bcma_eromreg.h                   | 2 ++
 sys/dev/bhnd/bcma/bcma_eromvar.h                   | 2 ++
 sys/dev/bhnd/bcma/bcma_subr.c                      | 2 ++
 sys/dev/bhnd/bcma/bcmavar.h                        | 2 ++
 sys/dev/bhnd/bhnd.c                                | 2 ++
 sys/dev/bhnd/bhnd.h                                | 2 ++
 sys/dev/bhnd/bhnd_debug.h                          | 2 ++
 sys/dev/bhnd/bhnd_erom.c                           | 2 ++
 sys/dev/bhnd/bhnd_erom.h                           | 2 ++
 sys/dev/bhnd/bhnd_erom_types.h                     | 2 ++
 sys/dev/bhnd/bhnd_eromvar.h                        | 2 ++
 sys/dev/bhnd/bhnd_ids.h                            | 2 ++
 sys/dev/bhnd/bhnd_match.h                          | 2 ++
 sys/dev/bhnd/bhnd_private.h                        | 2 ++
 sys/dev/bhnd/bhnd_subr.c                           | 2 ++
 sys/dev/bhnd/bhnd_types.h                          | 2 ++
 sys/dev/bhnd/bhndreg.h                             | 2 ++
 sys/dev/bhnd/bhndvar.h                             | 2 ++
 sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c          | 2 ++
 sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c        | 2 ++
 sys/dev/bhnd/cores/chipc/chipc.c                   | 2 ++
 sys/dev/bhnd/cores/chipc/chipc.h                   | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_cfi.c               | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_gpio.c              | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_gpiovar.h           | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_private.h           | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_slicer.c            | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_slicer.h            | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_spi.c               | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_spi.h               | 2 ++
 sys/dev/bhnd/cores/chipc/chipc_subr.c              | 2 ++
 sys/dev/bhnd/cores/chipc/chipcreg.h                | 2 ++
 sys/dev/bhnd/cores/chipc/chipcvar.h                | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pci.c                  | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c            | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h         | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pcib.c                 | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pcibvar.h              | 4 +++-
 sys/dev/bhnd/cores/pci/bhnd_pcireg.h               | 2 ++
 sys/dev/bhnd/cores/pci/bhnd_pcivar.h               | 4 +++-
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c              | 2 ++
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c        | 2 ++
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h     | 4 +++-
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h          | 2 ++
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h          | 4 +++-
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c             | 2 ++
 sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h         | 4 +++-
 sys/dev/bhnd/cores/pmu/bhnd_pmu.c                  | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmu.h                  | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c             | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h          | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c             | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h            | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmureg.h               | 2 ++
 sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h               | 2 ++
 sys/dev/bhnd/cores/usb/bhnd_ehci.c                 | 2 ++
 sys/dev/bhnd/cores/usb/bhnd_ohci.c                 | 2 ++
 sys/dev/bhnd/cores/usb/bhnd_usb.c                  | 2 ++
 sys/dev/bhnd/cores/usb/bhnd_usbvar.h               | 2 ++
 sys/netpfil/pf/if_pflog.c                          | 2 ++
 sys/netpfil/pf/in4_cksum.c                         | 2 +-
 sys/netpfil/pf/pf.h                                | 2 +-
 sys/netpfil/pf/pf_osfp.c                           | 2 ++
 usr.bin/sdiotool/brcmfmac_bus.h                    | 4 +++-
 usr.bin/sdiotool/brcmfmac_sdio.h                   | 4 +++-
 usr.bin/sdiotool/cam_sdio.h                        | 2 ++
 usr.bin/sdiotool/linux_compat.h                    | 2 ++
 usr.bin/sdiotool/linux_sdio_compat.h               | 2 ++
 258 files changed, 688 insertions(+), 200 deletions(-)

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 854d720e5812..357a444a0d2e 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * ++Copyright++ 1983, 1993
  * -
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index f0e3482a8d24..5dcc4f3b911c 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
+ *
  * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2003  Internet Software Consortium.
  *
@@ -16,8 +18,6 @@
  */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1983, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
  *
diff --git a/include/ftw.h b/include/ftw.h
index f01fda20d925..95f2ef285c1a 100644
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -1,6 +1,8 @@
 /*	$OpenBSD: ftw.h,v 1.1 2003/07/21 21:13:18 millert Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/include/hesiod.h b/include/hesiod.h
index 5879632e09bc..e8c38d84dccb 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -3,7 +3,7 @@
 
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC)
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/netdb.h b/include/netdb.h
index f46f5a3cf506..a106338a1802 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * Copyright (c) 1980, 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index d9641faaa10d..fd54642da21b 100644
--- a/include/readpassphrase.h
+++ b/include/readpassphrase.h
@@ -1,7 +1,9 @@
 /*	$OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $	*/
 /*	$FreeBSD$	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/include/res_update.h b/include/res_update.h
index 06f3b3a5dd54..32d363bacfae 100644
--- a/include/res_update.h
+++ b/include/res_update.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999 by Internet Software Consortium, Inc.
  *
diff --git a/include/resolv.h b/include/resolv.h
index 1f4a9bc8d6de..2226c481c7e6 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
  *
  * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1995-2003  Internet Software Consortium.
diff --git a/include/unwind.h b/include/unwind.h
index b87722261185..5a07fd819f50 100644
--- a/include/unwind.h
+++ b/include/unwind.h
@@ -1,6 +1,10 @@
 /* $FreeBSD$ */
 
-/* libunwind - a platform-independent unwind library
+/*-
+   libunwind - a platform-independent unwind library
+
+   SPDX-License-Identifier: ISC
+
    Copyright (C) 2003 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
diff --git a/include/wchar.h b/include/wchar.h
index 5951a2c7cc65..1c9d232d47e3 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause-NetBSD)
  *
  * Copyright (c)1999 Citrus Project,
  * All rights reserved.
diff --git a/lib/libc/include/isc/eventlib.h b/lib/libc/include/isc/eventlib.h
index a4cfdf909226..7e10063ab1fb 100644
--- a/lib/libc/include/isc/eventlib.h
+++ b/lib/libc/include/isc/eventlib.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1995-1999, 2001, 2003  Internet Software Consortium.
  *
diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
index ffd0c511d763..cdc98a8474be 100644
--- a/lib/libc/include/isc/list.h
+++ b/lib/libc/include/isc/list.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1997,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/include/isc/platform.h b/lib/libc/include/isc/platform.h
index a0513be8dde0..b514cb4243a3 100644
--- a/lib/libc/include/isc/platform.h
+++ b/lib/libc/include/isc/platform.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index d9af1247bd38..d765e0279c6c 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * Copyright (c) 1983, 1990, 1993
  *    The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
index 33d8ea114202..8be860a72700 100644
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ b/lib/libc/inet/inet_cidr_ntop.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
index 4625c84fb197..413db6c979e2 100644
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
index 001a30408c50..53b284577cdb 100644
--- a/lib/libc/inet/inet_net_ntop.c
+++ b/lib/libc/inet/inet_net_ntop.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
index fa187591f09b..6d21087cdce9 100644
--- a/lib/libc/inet/inet_net_pton.c
+++ b/lib/libc/inet/inet_net_pton.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996, 1998, 1999, 2001, 2003  Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
index 06a1bdbe1365..ab2a97ad2a7d 100644
--- a/lib/libc/inet/inet_neta.c
+++ b/lib/libc/inet/inet_neta.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index 22f1db22d185..650ffaf178d6 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index 852a613f110e..19b119764e97 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index 015ab50fd106..0bf190d7c12a 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
index 5b8a8cb2b17c..e5f50b3c8da4 100644
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
index 5ddd5bc6c646..fc179e225288 100644
--- a/lib/libc/nameser/ns_netint.c
+++ b/lib/libc/nameser/ns_netint.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index 7294c9298b67..7a3382ed7703 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 27d653871176..52f13e2673c7 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index 549b773cd9a7..858d0d1436a5 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
index da7df67bf52f..2ebbcc4f8c17 100644
--- a/lib/libc/nameser/ns_ttl.c
+++ b/lib/libc/nameser/ns_ttl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index 0218ef8e303a..aa6d61496621 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * Copyright (c) 1987, 1993
  *    The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 4237a9244b94..1048ef453fe0 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * Copyright (c) 1985, 1993
  *    The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index 6b83df23ff2a..a04749b9a3f5 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index e25f00aa55fc..218056d51f81 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
+ *
  * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2003  Internet Software Consortium.
  *
@@ -16,8 +18,6 @@
  */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1985
  *    The Regents of the University of California.  All rights reserved.
  *
diff --git a/lib/libc/resolv/res_debug.h b/lib/libc/resolv/res_debug.h
index c28171d7c805..088046ad0d5e 100644
--- a/lib/libc/resolv/res_debug.h
+++ b/lib/libc/resolv/res_debug.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999 by Internet Software Consortium.
  *
@@ -13,6 +15,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _RES_DEBUG_H_
diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c
index 515be11b74f3..7e326f1a135c 100644
--- a/lib/libc/resolv/res_findzonecut.c
+++ b/lib/libc/resolv/res_findzonecut.c
@@ -2,7 +2,9 @@
 static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $";
 #endif /* not lint */
 
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 06233c7abcfc..cf811d1838aa 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (BSD-3-Clause AND ISC)
  *
  * Copyright (c) 1985, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 564580107d25..3b009085af6c 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
+ *
  * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996, 1997, 1988, 1999, 2001, 2003  Internet Software Consortium.
  *
@@ -16,8 +18,6 @@
  */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1985, 1993
  *    The Regents of the University of California.  All rights reserved.
  *
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 9a7a129ac82c..80e8ab2b0e0f 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 56ff529c8d67..8270e26ecdfb 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
  *
  * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index f7648a86c384..366ec394a59e 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: (ISC AND BSD-3-Clause)
  *
  * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2003  Internet Software Consortium.
diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c
index 8e866e3edf8b..388f643996dc 100644
--- a/lib/libc/resolv/res_update.c
+++ b/lib/libc/resolv/res_update.c
@@ -2,7 +2,9 @@
 static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $";
 #endif /* not lint */
 
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
diff --git a/sys/dev/ath/ath_hal/ah.c b/sys/dev/ath/ath_hal/ah.c
index 74c6f1a3b16b..7f5649ed4e8d 100644
--- a/sys/dev/ath/ath_hal/ah.c
+++ b/sys/dev/ath/ath_hal/ah.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index dc3bb45e30fc..4d9ca773917e 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_btcoex.h b/sys/dev/ath/ath_hal/ah_btcoex.h
index e3849d796f18..6949f531d962 100644
--- a/sys/dev/ath/ath_hal/ah_btcoex.h
+++ b/sys/dev/ath/ath_hal/ah_btcoex.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2014 Qualcomm Atheros, Inc.
  * All Rights Reserved.
  *
diff --git a/sys/dev/ath/ath_hal/ah_debug.h b/sys/dev/ath/ath_hal/ah_debug.h
index 262f72006376..b5d736520e07 100644
--- a/sys/dev/ath/ath_hal/ah_debug.h
+++ b/sys/dev/ath/ath_hal/ah_debug.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_decode.h b/sys/dev/ath/ath_hal/ah_decode.h
index 3aca9750448c..b3c88b807919 100644
--- a/sys/dev/ath/ath_hal/ah_decode.h
+++ b/sys/dev/ath/ath_hal/ah_decode.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_desc.h b/sys/dev/ath/ath_hal/ah_desc.h
index 9caa30062050..a7758a0e87c7 100644
--- a/sys/dev/ath/ath_hal/ah_desc.h
+++ b/sys/dev/ath/ath_hal/ah_desc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_devid.h b/sys/dev/ath/ath_hal/ah_devid.h
index a5006a04554b..11da9cb3780f 100644
--- a/sys/dev/ath/ath_hal/ah_devid.h
+++ b/sys/dev/ath/ath_hal/ah_devid.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_diagcodes.h b/sys/dev/ath/ath_hal/ah_diagcodes.h
index df23242ac51a..75259907ca39 100644
--- a/sys/dev/ath/ath_hal/ah_diagcodes.h
+++ b/sys/dev/ath/ath_hal/ah_diagcodes.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom.h b/sys/dev/ath/ath_hal/ah_eeprom.h
index 3e9330b57383..f360e8c1279f 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_9287.c b/sys/dev/ath/ath_hal/ah_eeprom_9287.c
index abdbce0564d3..974580d26394 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_9287.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_9287.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_9287.h b/sys/dev/ath/ath_hal/ah_eeprom_9287.h
index ff8080aa3a64..891b4841b153 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_9287.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_9287.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v1.c b/sys/dev/ath/ath_hal/ah_eeprom_v1.c
index 8b4664fc9800..219c7e62756d 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v1.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v1.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v1.h b/sys/dev/ath/ath_hal/ah_eeprom_v1.h
index 22fce8a092e9..b4b0e5eb3080 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v1.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v1.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v14.c b/sys/dev/ath/ath_hal/ah_eeprom_v14.c
index 37e973c16921..3ae81217327d 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v14.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v14.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v14.h b/sys/dev/ath/ath_hal/ah_eeprom_v14.h
index 7b2c898ce6ee..8e268ea75e02 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v14.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v14.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v3.c b/sys/dev/ath/ath_hal/ah_eeprom_v3.c
index 3a7b0cc2221d..9d7d011fcd65 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v3.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v3.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v3.h b/sys/dev/ath/ath_hal/ah_eeprom_v3.h
index cde9a10af3f0..2ec54713b261 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v3.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v3.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v4k.c b/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
index 12cb67e437f8..69142ded5447 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v4k.h b/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
index 3487de472455..f9cd266457d0 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h
index 043baa51bf45..6b584c2454b3 100644
--- a/sys/dev/ath/ath_hal/ah_internal.h
+++ b/sys/dev/ath/ath_hal/ah_internal.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ah_regdomain.c b/sys/dev/ath/ath_hal/ah_regdomain.c
index 941eb93f35d0..77bf417c2e41 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain.c
+++ b/sys/dev/ath/ath_hal/ah_regdomain.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2006 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain.h b/sys/dev/ath/ath_hal/ah_regdomain.h
index 9d6e59bbc85b..8e8d7df662a8 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2006 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h
index af4824c3b5a0..32ecf638752d 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2011 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
index 0ebb6d174472..6555147b4e60 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2006 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h
index 84e7af7f5afd..c7169113c11b 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2006 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h
index d8d211e593ed..a45217e1e784 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2011 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
index 33a6a7c531f6..de6a8ac562ee 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2005-2006 Atheros Communications, Inc.
  * All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ah_soc.h b/sys/dev/ath/ath_hal/ah_soc.h
index ca75ae9a611f..3d77b8234857 100644
--- a/sys/dev/ath/ath_hal/ah_soc.h
+++ b/sys/dev/ath/ath_hal/ah_soc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210.h b/sys/dev/ath/ath_hal/ar5210/ar5210.h
index 74e07e812d51..756c8e03e51e 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210.h
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
index ccfc0ae1e1f4..22afc12a6dcc 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c b/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c
index e12b039723e5..cf4ac01d2483 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c b/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
index 96b1a2cb1918..3c2d771cdad3 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c b/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c
index 87fb06706de0..53b716b11b2e 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c b/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
index 207a20540c8e..347ad8891e36 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c b/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c
index 0455d652d783..0b726eaf2837 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_power.c b/sys/dev/ath/ath_hal/ar5210/ar5210_power.c
index ec5e75d36934..625d64a1850a 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_power.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_power.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c b/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c
index b43d80779061..38295b99d1ca 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c b/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
index 6029bff8b281..b5656fb36419 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c b/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
index d376996836a1..2b87dc2b6207 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210desc.h b/sys/dev/ath/ath_hal/ar5210/ar5210desc.h
index da5c51ff08de..cf2ddec1098a 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210desc.h
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210desc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210phy.h b/sys/dev/ath/ath_hal/ar5210/ar5210phy.h
index 4ab3025d9525..af3b46808b5a 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210phy.h
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210reg.h b/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
index 16cd74e9df0c..a045441a9d37 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2004 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211.h b/sys/dev/ath/ath_hal/ar5211/ar5211.h
index 2fcbcd9bcee3..7188966ef9ea 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211.h
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
index 5785d830cadf..1914cc3ea4cf 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c b/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c
index b2775d0376f5..6ad2a209dc22 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c b/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
index 4c20ca1b5a24..6184bc3d51c7 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c b/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c
index 3e0f922a4fec..8d703023edb3 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c b/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
index bcb544bb1af3..4395818ab2bd 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c b/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c
index d224732c080d..6507c879ed92 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_power.c b/sys/dev/ath/ath_hal/ar5211/ar5211_power.c
index e646d90b66ca..0a33ad3e09d1 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_power.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_power.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c b/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c
index 27c483527281..9b3bb677d5d6 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c b/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
index a4f3680635d4..4fc3ff432fc2 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c b/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c
index dc0ad3f51c2c..4bcb8fd6497a 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211desc.h b/sys/dev/ath/ath_hal/ar5211/ar5211desc.h
index 8702e9119de3..3b2d5a87a7e6 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211desc.h
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211desc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211phy.h b/sys/dev/ath/ath_hal/ar5211/ar5211phy.h
index bf5b67e51ab1..c344cdc9b054 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211phy.h
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211reg.h b/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
index 93d4fc5d9b8b..ef2fb863d815 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2006 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar2316.c b/sys/dev/ath/ath_hal/ar5212/ar2316.c
index 45899383e2cd..186e72e9856c 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar2316.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar2316.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar2317.c b/sys/dev/ath/ath_hal/ar5212/ar2317.c
index 0db8c328048b..29a9b369f3a5 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar2317.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar2317.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar2413.c b/sys/dev/ath/ath_hal/ar5212/ar2413.c
index 1034b2ba8870..e2a8d0203360 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar2413.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar2413.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar2425.c b/sys/dev/ath/ath_hal/ar5212/ar2425.c
index e310801c8279..9159ad2370d1 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar2425.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar2425.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5111.c b/sys/dev/ath/ath_hal/ar5212/ar5111.c
index f9fd3f3b2641..128332266b52 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5111.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5111.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5112.c b/sys/dev/ath/ath_hal/ar5212/ar5112.c
index c1920b935fd0..1e9e20355677 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5112.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5112.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212.h b/sys/dev/ath/ath_hal/ar5212/ar5212.h
index bab061dbb39b..0baba50c55e6 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
index c7b5932964c9..4d4087012012 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
index 83b49139d65a..82bc762f75d2 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c b/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
index b52077f10d32..61997a0f75a6 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c b/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
index f4b67715b4d4..fbdda5ae8c6d 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c b/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c
index b2363af92801..534a6b72f735 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c b/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
index 47f9e7400f9e..ead62adfce48 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c b/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
index bf7db4942b42..fa6936231952 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
index e2f1eb7c0f01..6450c8d6f426 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c b/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
index ac55be605594..6f9c9dc1744b 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_power.c b/sys/dev/ath/ath_hal/ar5212/ar5212_power.c
index dc9179621980..427579ddfb77 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_power.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_power.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c b/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
index 958a954af1a7..a2e36be5f70e 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c b/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
index 7c9158e91d2b..a5e9ca65d056 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c b/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
index f9fbc9ca5c36..a235595d2d0f 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c b/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
index 5aeefed828f3..6b8730b0d063 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212desc.h b/sys/dev/ath/ath_hal/ar5212/ar5212desc.h
index ce01dd2d5464..0b669aa97d7c 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212desc.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212desc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212phy.h b/sys/dev/ath/ath_hal/ar5212/ar5212phy.h
index 9e9bbbf76174..a91f2c10ee87 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212phy.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212reg.h b/sys/dev/ath/ath_hal/ar5212/ar5212reg.h
index 96dfa9d58061..0bfc5f0a35ef 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212reg.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5311reg.h b/sys/dev/ath/ath_hal/ar5212/ar5311reg.h
index b79370ebba66..79c731da59d6 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5311reg.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5311reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5413.c b/sys/dev/ath/ath_hal/ar5212/ar5413.c
index f7251e241ffc..1d57b9ec7450 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5413.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5413.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312.h b/sys/dev/ath/ath_hal/ar5312/ar5312.h
index d7293562033a..70ff4df8437d 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312.h
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c b/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
index 5c84eb87eb0c..66cae2207560 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c b/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
index 7a84232e0b57..9b79c36c323f 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c b/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c
index 20a575dd20cb..809904d649b5 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c b/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
index 0a1545c075cb..43cdda719db6 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c b/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c
index 3d85ece7d54a..5eca696e9ea0 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_power.c b/sys/dev/ath/ath_hal/ar5312/ar5312_power.c
index 7db6d80cb495..a5055dcd77e3 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_power.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_power.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c b/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c
index 1f1f6cfe3eb0..ebc12277a736 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312phy.h b/sys/dev/ath/ath_hal/ar5312/ar5312phy.h
index fcb8564c77e3..aa8d41f959dd 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312phy.h
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312reg.h b/sys/dev/ath/ath_hal/ar5312/ar5312reg.h
index bdfeffa9660b..0e78a52dfe9e 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312reg.h
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c b/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c
index 4c04c86db07d..5fe8eec6c225 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar2133.c b/sys/dev/ath/ath_hal/ar5416/ar2133.c
index 457a7c3034b1..c4ac3e9fee05 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar2133.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar2133.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416.h b/sys/dev/ath/ath_hal/ar5416/ar5416.h
index d7d0579d257a..1fa96afe312d 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c b/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
index fadd5ad93f8d..54f1293d9622 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
index 5b10c7c80fd9..8957dedb39dc 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c b/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
index 6691c11bcdd0..7de707b3293c 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c b/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
index 69d605f68a78..d2f0f17ada46 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2005 Atheros Communications, Inc.
  * Copyright (c) 2008-2010, Atheros Communications Inc.
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h b/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h
index 0d3e31644717..dd1d8b37b3f9 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2011 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
index f71629bbdb5f..d4e34db3e9d8 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h
index a4f19e592c0a..5cf1ed0ef108 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
index 9083d3ab6563..80d73d2690e9 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
index 4af1ca4d670c..927e90b84e3a 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
index 939ba127ceae..d7d89dbc0c82 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c b/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
index 2947726d8ebc..c5fb97c2a798 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c b/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
index 3c493b43f4eb..1695eda2c5f6 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c b/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
index 32ce2ed5b071..932f9b3ca726 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c b/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c
index 533fe03e22f6..85595d935d54 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c b/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
index dd768434394e..37337a90a2d0 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c b/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c
index 1cfd9644d2c1..03a33de093ea 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_power.c b/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
index dff9a855917a..bcd5fd9807a8 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c b/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
index 9759b74d9692..fc2f2bbaabee 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010-2011 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c b/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
index df096f93700e..372e2795dc20 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
index 9542480fea8c..6c5cf53c325b 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c b/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c
index 1a936e082a34..a5f1251607a8 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2012 Qualcomm Atheros, All Rights Reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
index 6fba3754cb89..869d5fbea30a 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416desc.h b/sys/dev/ath/ath_hal/ar5416/ar5416desc.h
index 27303946f927..0e58bc61eba8 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416desc.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416desc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416phy.h b/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
index 4884dac8d5f0..bc9b99efeaf5 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
index de424be7df3a..ff4f558efa83 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
index c270babf330c..1d78b053c372 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c
index 81bd0fe2d535..f04e8f59fec2 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h
index 5d1013b23890..67bad6192b40 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
index a71fdfad6235..e7b6ddacae6c 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h
index 516df9277fe3..8997329f8eda 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130reg.h b/sys/dev/ath/ath_hal/ar9001/ar9130reg.h
index c289c32e2c91..cd8f0cbb29f3 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130reg.h
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130reg.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
index 5bda519e3b5c..f74da22d1e7c 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280.c b/sys/dev/ath/ath_hal/ar9002/ar9280.c
index c9aabf0ca3da..4bbd9b23a05d 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280.h b/sys/dev/ath/ath_hal/ar9002/ar9280.h
index e383918abbfa..63c64948af3b 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
index 3be3e3539a55..92479214e5a5 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285.c b/sys/dev/ath/ath_hal/ar9002/ar9285.c
index 9e9f95cac851..c4362637c173 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285.h b/sys/dev/ath/ath_hal/ar9002/ar9285.h
index b37b29781451..04b3c6ea6993 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
index eb3490a61ae3..5c140b98dbb1 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
index 4d79a4f842d7..3a168ae45ead 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2005 Atheros Communications, Inc.
  * Copyright (c) 2008-2010, Atheros Communications Inc.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c b/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
index cb5940fb77b5..961e25e89efa 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285an.h b/sys/dev/ath/ath_hal/ar9002/ar9285an.h
index 3b80938e3abb..9b868b9d4162 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285an.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285an.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287.c b/sys/dev/ath/ath_hal/ar9002/ar9287.c
index 724fb7c55dd1..f365c3917cf3 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287.h b/sys/dev/ath/ath_hal/ar9002/ar9287.h
index 3122ea4318ba..669e73504d5b 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
index 0ea565c271c1..8341535bdb97 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2008-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h
index ff21ce6da5fc..c996e58cfc80 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c b/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
index 5ed4af2330f3..372d6c476d12 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
  * Copyright (c) 2002-2008 Atheros Communications, Inc.
  *
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h b/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h
index 679fb8cfc81f..43b42e8c87f0 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287an.h b/sys/dev/ath/ath_hal/ar9002/ar9287an.h
index ba7a92cbaa64..4e9c0ed66b3f 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287an.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287an.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287phy.h b/sys/dev/ath/ath_hal/ar9002/ar9287phy.h
index 8f28194e44ba..05e57089484c 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287phy.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h b/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h
index 583636ec8097..8095a5cd17d3 100644
--- a/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h
+++ b/sys/dev/ath/ath_hal/ar9003/ar9300_btcoex.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2011 Atheros Communications, Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c
index deeb2949008d..2b09adad4b6b 100644
--- a/sys/dev/bhnd/bcma/bcma.c
+++ b/sys/dev/bhnd/bcma/bcma.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcma.h b/sys/dev/bhnd/bcma/bcma.h
index 02fc427e0dff..55f73971cb36 100644
--- a/sys/dev/bhnd/bcma/bcma.h
+++ b/sys/dev/bhnd/bcma/bcma.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bcma/bcma_bhndb.c b/sys/dev/bhnd/bcma/bcma_bhndb.c
index 3e574dd57cae..f39b22f8781a 100644
--- a/sys/dev/bhnd/bcma/bcma_bhndb.c
+++ b/sys/dev/bhnd/bcma/bcma_bhndb.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bcma/bcma_dmp.h b/sys/dev/bhnd/bcma/bcma_dmp.h
index 36f84f1388d2..01bcbe68f3ba 100644
--- a/sys/dev/bhnd/bcma/bcma_dmp.h
+++ b/sys/dev/bhnd/bcma/bcma_dmp.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010 Broadcom Corporation
  * 
diff --git a/sys/dev/bhnd/bcma/bcma_erom.c b/sys/dev/bhnd/bcma/bcma_erom.c
index 88bd1a899a82..7b5ab846f961 100644
--- a/sys/dev/bhnd/bcma/bcma_erom.c
+++ b/sys/dev/bhnd/bcma/bcma_erom.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2017 Landon Fuller <landonf@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcma_eromreg.h b/sys/dev/bhnd/bcma/bcma_eromreg.h
index b95484b1ccdb..844f98fa17d9 100644
--- a/sys/dev/bhnd/bcma/bcma_eromreg.h
+++ b/sys/dev/bhnd/bcma/bcma_eromreg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010 Broadcom Corporation
  * 
diff --git a/sys/dev/bhnd/bcma/bcma_eromvar.h b/sys/dev/bhnd/bcma/bcma_eromvar.h
index 8fdbe2bf163b..f1c2a9396923 100644
--- a/sys/dev/bhnd/bcma/bcma_eromvar.h
+++ b/sys/dev/bhnd/bcma/bcma_eromvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bcma/bcma_subr.c b/sys/dev/bhnd/bcma/bcma_subr.c
index 3c7a67a304e0..5ebceb85073e 100644
--- a/sys/dev/bhnd/bcma/bcma_subr.c
+++ b/sys/dev/bhnd/bcma/bcma_subr.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcmavar.h b/sys/dev/bhnd/bcma/bcmavar.h
index f543b6e03d78..cc4250424b2f 100644
--- a/sys/dev/bhnd/bcma/bcmavar.h
+++ b/sys/dev/bhnd/bcma/bcmavar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd.c b/sys/dev/bhnd/bhnd.c
index f9935385d3f4..65638cf86e14 100644
--- a/sys/dev/bhnd/bhnd.c
+++ b/sys/dev/bhnd/bhnd.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h
index 4ec53b53741c..474e765f4143 100644
--- a/sys/dev/bhnd/bhnd.h
+++ b/sys/dev/bhnd/bhnd.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_debug.h b/sys/dev/bhnd/bhnd_debug.h
index 2591bb9a0743..312851175867 100644
--- a/sys/dev/bhnd/bhnd_debug.h
+++ b/sys/dev/bhnd/bhnd_debug.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bhnd_erom.c b/sys/dev/bhnd/bhnd_erom.c
index 56ef80e6e52b..2f55fb5554c0 100644
--- a/sys/dev/bhnd/bhnd_erom.c
+++ b/sys/dev/bhnd/bhnd_erom.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_erom.h b/sys/dev/bhnd/bhnd_erom.h
index 28268d2d08ee..d887f4971784 100644
--- a/sys/dev/bhnd/bhnd_erom.h
+++ b/sys/dev/bhnd/bhnd_erom.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2017 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_erom_types.h b/sys/dev/bhnd/bhnd_erom_types.h
index 5e650c170f97..37061107dda4 100644
--- a/sys/dev/bhnd/bhnd_erom_types.h
+++ b/sys/dev/bhnd/bhnd_erom_types.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bhnd_eromvar.h b/sys/dev/bhnd/bhnd_eromvar.h
index 25fae616aa85..c230d1413bc6 100644
--- a/sys/dev/bhnd/bhnd_eromvar.h
+++ b/sys/dev/bhnd/bhnd_eromvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bhnd_ids.h b/sys/dev/bhnd/bhnd_ids.h
index df16b12eb679..32dda34eaad4 100644
--- a/sys/dev/bhnd/bhnd_ids.h
+++ b/sys/dev/bhnd/bhnd_ids.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 1999-2015, Broadcom Corporation
  * 
diff --git a/sys/dev/bhnd/bhnd_match.h b/sys/dev/bhnd/bhnd_match.h
index 3090929af790..cd04ffcf3249 100644
--- a/sys/dev/bhnd/bhnd_match.h
+++ b/sys/dev/bhnd/bhnd_match.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bhnd_private.h b/sys/dev/bhnd/bhnd_private.h
index 26c239b7f1bb..423650a69426 100644
--- a/sys/dev/bhnd/bhnd_private.h
+++ b/sys/dev/bhnd/bhnd_private.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c
index 12c4cd504074..36e9e37e1333 100644
--- a/sys/dev/bhnd/bhnd_subr.c
+++ b/sys/dev/bhnd/bhnd_subr.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_types.h b/sys/dev/bhnd/bhnd_types.h
index d9e5735c9ff3..b73125b39f2a 100644
--- a/sys/dev/bhnd/bhnd_types.h
+++ b/sys/dev/bhnd/bhnd_types.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhndreg.h b/sys/dev/bhnd/bhndreg.h
index be295c408fd1..c880cbd8e95c 100644
--- a/sys/dev/bhnd/bhndreg.h
+++ b/sys/dev/bhnd/bhndreg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010 Broadcom Corporation
  * All rights reserved.
diff --git a/sys/dev/bhnd/bhndvar.h b/sys/dev/bhnd/bhndvar.h
index 6e03baae85c2..eb9f77e35ef2 100644
--- a/sys/dev/bhnd/bhndvar.h
+++ b/sys/dev/bhnd/bhndvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
index 25b1abb6f0b6..14ee0385cf5e 100644
--- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
+++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
index c3299f51de95..0e1c36a7c9da 100644
--- a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
+++ b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c
index 10cc7142048d..52efcbf3a34e 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.c
+++ b/sys/dev/bhnd/cores/chipc/chipc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/chipc/chipc.h b/sys/dev/bhnd/cores/chipc/chipc.h
index d42d4892f633..f9bc2f83fe91 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.h
+++ b/sys/dev/bhnd/cores/chipc/chipc.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_cfi.c b/sys/dev/bhnd/cores/chipc/chipc_cfi.c
index 5a4461d1fb7f..20a5ae9d3e5b 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_cfi.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_cfi.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpio.c b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
index 8a10f2d1e357..4d13d6637990 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_gpio.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
index f4bb0baced05..664e021ea197 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_private.h b/sys/dev/bhnd/cores/chipc/chipc_private.h
index a3820ce56dce..8a8079d590c1 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_private.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_private.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_slicer.c b/sys/dev/bhnd/cores/chipc/chipc_slicer.c
index 4c6969d7ff2f..8666e13dc3a3 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_slicer.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_slicer.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_slicer.h b/sys/dev/bhnd/cores/chipc/chipc_slicer.h
index 6f296262891a..077f0256b26b 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_slicer.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_slicer.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.c b/sys/dev/bhnd/cores/chipc/chipc_spi.c
index 2f44d412d94c..045015da01aa 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.h b/sys/dev/bhnd/cores/chipc/chipc_spi.h
index 5f10aee5134d..9424a0287872 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/chipc/chipc_subr.c b/sys/dev/bhnd/cores/chipc/chipc_subr.c
index 7cc41eb807bd..ea182894f000 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_subr.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_subr.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipcreg.h b/sys/dev/bhnd/cores/chipc/chipcreg.h
index 7cf1f7b529f7..4ad6fcf9d357 100644
--- a/sys/dev/bhnd/cores/chipc/chipcreg.h
+++ b/sys/dev/bhnd/cores/chipc/chipcreg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010-2015 Broadcom Corporation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipcvar.h b/sys/dev/bhnd/cores/chipc/chipcvar.h
index ce1836d83dd9..7da0d9bf9bcb 100644
--- a/sys/dev/bhnd/cores/chipc/chipcvar.h
+++ b/sys/dev/bhnd/cores/chipc/chipcvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci.c b/sys/dev/bhnd/cores/pci/bhnd_pci.c
index 87ff4bdde88b..a19c0c254b14 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
index 565ac51074ff..66881b9965aa 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
index 9fab99e196b6..524d1f950e24 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcib.c b/sys/dev/bhnd/cores/pci/bhnd_pcib.c
index 4983a38912bf..432414736f73 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcib.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcib.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
index a3e6f1fcd308..5faddf8562f7 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
@@ -39,4 +41,4 @@ struct bhnd_pcib_softc {
 	struct bhnd_pci_softc	sc_common;
 };
 
-#endif /* _BHND_CORES_PCI_BHND_PCIBVAR_H_ */
\ No newline at end of file
+#endif /* _BHND_CORES_PCI_BHND_PCIBVAR_H_ */
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcireg.h b/sys/dev/bhnd/cores/pci/bhnd_pcireg.h
index 229f4c8a880f..1f40b23a7ef4 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcireg.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcireg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010 Broadcom Corporation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
index 9139d8d7d066..d1ef94c1b23e 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
@@ -185,4 +187,4 @@ struct bhnd_pci_softc {
 	BHND_PCIE_ ## _name						\
 )
 
-#endif /* _BHND_CORES_PCI_BHND_PCIVAR_H_ */
\ No newline at end of file
+#endif /* _BHND_CORES_PCI_BHND_PCIVAR_H_ */
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
index 626d6294f41e..3a6712abff61 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
index 5f4b0cb22b92..12734437136a 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
index 97bbba7d67ec..f1204ca36874 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
@@ -69,4 +71,4 @@ struct bhnd_pcie2hb_softc {
 };
 
 
-#endif /* _BHND_CORES_PCIE2_BHND_PCI_HOSTBVAR_H_ */
\ No newline at end of file
+#endif /* _BHND_CORES_PCIE2_BHND_PCI_HOSTBVAR_H_ */
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h
index a8d46282e95c..e128c4bf723c 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2015 Broadcom Corporation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
index 154b059bc91a..5017a7f4d88f 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
@@ -95,4 +97,4 @@ struct bhnd_pcie2_softc {
 #define	BHND_PCIE2_LOCK_ASSERT(sc, what)	mtx_assert(&(sc)->mtx, what)
 #define	BHND_PCIE2_LOCK_DESTROY(sc)		mtx_destroy(&(sc)->mtx)
 
-#endif /* _BHND_CORES_PCIE2_BHND_PCIE2_VAR_H_ */
\ No newline at end of file
+#endif /* _BHND_CORES_PCIE2_BHND_PCIE2_VAR_H_ */
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
index 90d84ebfe79b..807d1740985f 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
index aeddfb58f9a3..1170b62ef637 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
@@ -39,4 +41,4 @@ struct bhnd_pcie2b_softc {
 	struct bhnd_pcie2_softc	sc_common;
 };
 
-#endif /* _BHND_CORES_PCIE2_BHND_PCIE2BVAR_H_ */
\ No newline at end of file
+#endif /* _BHND_CORES_PCIE2_BHND_PCIE2BVAR_H_ */
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
index ea050cda1813..85d93d2b2c20 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
index a83e6d622c02..ee1538151882 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
index 5575f2e29629..1d04f07ea714 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
index 2cc282c9c35c..93242931ca62 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (C) 2010, Broadcom Corporation.
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
index c0784448e85e..85943306b806 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (C) 2010, Broadcom Corporation.
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
index 2f4dc1ea1bd9..700ff3287b16 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h b/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
index 059f59b83e84..6b88d3000447 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
  * Copyright (c) 2010 Broadcom Corporation
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
index 162f25803d31..1bc0ff729e18 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015 Landon Fuller <landon@landonf.org>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/usb/bhnd_ehci.c b/sys/dev/bhnd/cores/usb/bhnd_ehci.c
index 51c69f67230c..62bb121a3d58 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_ehci.c
+++ b/sys/dev/bhnd/cores/usb/bhnd_ehci.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
  * Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c
index 1f3d345b4b1d..0308562e7ae6 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c
+++ b/sys/dev/bhnd/cores/usb/bhnd_ohci.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/usb/bhnd_usb.c b/sys/dev/bhnd/cores/usb/bhnd_usb.c
index d918062b93fd..52b09c4998fb 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_usb.c
+++ b/sys/dev/bhnd/cores/usb/bhnd_usb.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
  * All rights reserved.
  *
diff --git a/sys/dev/bhnd/cores/usb/bhnd_usbvar.h b/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
index 63ad0dcc1be0..493fca24ed89 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
+++ b/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
  * All rights reserved.
  *
diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index cbf596b7e89e..6c072701457d 100644
--- a/sys/netpfil/pf/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
  * Niels Provos (provos@physnet.uni-hamburg.de).
diff --git a/sys/netpfil/pf/in4_cksum.c b/sys/netpfil/pf/in4_cksum.c
index 92ebea1b24ea..ca68866c7704 100644
--- a/sys/netpfil/pf/in4_cksum.c
+++ b/sys/netpfil/pf/in4_cksum.c
@@ -3,7 +3,7 @@
 /*	$KAME: in4_cksum.c,v 1.10 2001/11/30 10:06:15 itojun Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $	*/
 
-/*
+/*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (C) 1999 WIDE Project.
diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h
index 333faea3c408..694727826f4a 100644
--- a/sys/netpfil/pf/pf.h
+++ b/sys/netpfil/pf/pf.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 Daniel Hartmeier
diff --git a/sys/netpfil/pf/pf_osfp.c b/sys/netpfil/pf/pf_osfp.c
index 9c41cf55d435..a748dc4118fe 100644
--- a/sys/netpfil/pf/pf_osfp.c
+++ b/sys/netpfil/pf/pf_osfp.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/usr.bin/sdiotool/brcmfmac_bus.h b/usr.bin/sdiotool/brcmfmac_bus.h
index 2c7cb2953598..27baad34d747 100644
--- a/usr.bin/sdiotool/brcmfmac_bus.h
+++ b/usr.bin/sdiotool/brcmfmac_bus.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/usr.bin/sdiotool/brcmfmac_sdio.h b/usr.bin/sdiotool/brcmfmac_sdio.h
index c4d0b3756def..5a972d99816f 100644
--- a/usr.bin/sdiotool/brcmfmac_sdio.h
+++ b/usr.bin/sdiotool/brcmfmac_sdio.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: ISC
+ *
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/usr.bin/sdiotool/cam_sdio.h b/usr.bin/sdiotool/cam_sdio.h
index 6f57fada45a0..32d8d079de0e 100644
--- a/usr.bin/sdiotool/cam_sdio.h
+++ b/usr.bin/sdiotool/cam_sdio.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Ilya Bakulin
  * All rights reserved.
  *
diff --git a/usr.bin/sdiotool/linux_compat.h b/usr.bin/sdiotool/linux_compat.h
index 7f49fbde0a09..f9d8dd55132c 100644
--- a/usr.bin/sdiotool/linux_compat.h
+++ b/usr.bin/sdiotool/linux_compat.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2016-2017 Ilya Bakulin
  * All rights reserved.
  *
diff --git a/usr.bin/sdiotool/linux_sdio_compat.h b/usr.bin/sdiotool/linux_sdio_compat.h
index 671da405d374..9236a23eff94 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.h
+++ b/usr.bin/sdiotool/linux_sdio_compat.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Ilya Bakulin
  * All rights reserved.
  *