diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:07:59 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:07:59 -0200 |
| commit | baeac042059786f1ed0cca7ca4a4a32721362cab (patch) | |
| tree | 3b848bddaf0f478d0c0651c8ee62129d3d9bacf5 /sys/modules | |
| parent | 1af1408e09373ae856cfef567d79849c7e7e0d25 (diff) | |
| parent | f91948fdd5322d9aae1e8785976df69612c1999f (diff) | |
| download | FreeBSD-src-baeac042059786f1ed0cca7ca4a4a32721362cab.zip FreeBSD-src-baeac042059786f1ed0cca7ca4a4a32721362cab.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/cxgbe/t4_firmware/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/cxgbe/t5_firmware/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/cxgbe/t6_firmware/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/hyperv/netvsc/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/hyperv/utilities/Makefile | 7 | ||||
| -rw-r--r-- | sys/modules/sfxge/Makefile | 4 |
6 files changed, 13 insertions, 7 deletions
diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile index 20e95d5..3fecead 100644 --- a/sys/modules/cxgbe/t4_firmware/Makefile +++ b/sys/modules/cxgbe/t4_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T4FW_VER= 1.16.22.0 +T4FW_VER= 1.16.26.0 FIRMWS+= t4fw.fw:t4fw:${T4FW_VER} CLEANFILES+= t4fw.fw diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile index 45c1461..2419a19 100644 --- a/sys/modules/cxgbe/t5_firmware/Makefile +++ b/sys/modules/cxgbe/t5_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T5FW_VER= 1.16.22.0 +T5FW_VER= 1.16.26.0 FIRMWS+= t5fw.fw:t5fw:${T5FW_VER} CLEANFILES+= t5fw.fw diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile index 135264e..9bdde07 100644 --- a/sys/modules/cxgbe/t6_firmware/Makefile +++ b/sys/modules/cxgbe/t6_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T6FW_VER= 1.16.22.0 +T6FW_VER= 1.16.26.0 FIRMWS+= t6fw.fw:t6fw:${T6FW_VER} CLEANFILES+= t6fw.fw diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile index 1d572cb..e2a2533 100644 --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -5,7 +5,8 @@ KMOD= hv_netvsc SRCS= hn_nvs.c hn_rndis.c if_hn.c -SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h vmbus_if.h +SRCS+= bus_if.h device_if.h vmbus_if.h +SRCS+= opt_hn.h opt_inet.h opt_inet6.h opt_rss.h CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/netvsc diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile index 290bd27..deb2e8b 100644 --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -3,7 +3,12 @@ .PATH: ${.CURDIR}/../../../dev/hyperv/utilities KMOD= hv_utils -SRCS= hv_util.c hv_kvp.c hv_timesync.c hv_shutdown.c hv_heartbeat.c +SRCS= vmbus_ic.c +SRCS+= hv_kvp.c +SRCS+= hv_snapshot.c +SRCS+= vmbus_heartbeat.c +SRCS+= vmbus_shutdown.c +SRCS+= vmbus_timesync.c SRCS+= bus_if.h device_if.h vmbus_if.h CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile index b30d532..01d782e 100644 --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -17,7 +17,7 @@ SRCS+= sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h SRCS+= efx_bootcfg.c efx_crc32.c efx_ev.c efx_intr.c efx_lic.c efx_mac.c SRCS+= efx_mcdi.c efx_mon.c efx_nic.c SRCS+= efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c -SRCS+= efx_vpd.c efx_wol.c efx_filter.c efx_hash.c +SRCS+= efx_vpd.c efx_filter.c efx_hash.c SRCS+= efsys.h SRCS+= efx.h efx_check.h efx_impl.h efx_mcdi.h efx_regs.h efx_regs_ef10.h SRCS+= efx_regs_mcdi.h efx_regs_pci.h efx_types.h efx_phy_ids.h @@ -33,7 +33,7 @@ SRCS+= ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c SRCS+= ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c SRCS+= ef10_impl.h -SRCS+= hunt_nic.c hunt_phy.c +SRCS+= hunt_nic.c SRCS+= hunt_impl.h SRCS+= medford_nic.c |
