Update to FreeBSD stable/12 2019-01-16

Git mirror commit 4ff7d8141f665693dd8b17090d410604888f1e9a.

Update #3472.

3 files changed, 51 insertions, 24 deletions

diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index 28c8a349..c4c30ade 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -29,6 +29,7 @@
 #define	AliasSctpInit _bsd_AliasSctpInit
 #define	AliasSctpTerm _bsd_AliasSctpTerm
 #define	alloc_unr _bsd_alloc_unr
+#define	alloc_unr64 _bsd_alloc_unr64
 #define	alloc_unrl _bsd_alloc_unrl
 #define	alloc_unr_specific _bsd_alloc_unr_specific
 #define	altq_add _bsd_altq_add
@@ -3209,8 +3210,6 @@
 #define	pf_free_rule _bsd_pf_free_rule
 #define	pf_free_src_nodes _bsd_pf_free_src_nodes
 #define	pf_free_state _bsd_pf_free_state
-#define	pf_frent_previous _bsd_pf_frent_previous
-#define	pf_frent_remove _bsd_pf_frent_remove
 #define	pf_get_mtag _bsd_pf_get_mtag
 #define	pf_get_ruleset_number _bsd_pf_get_ruleset_number
 #define	pf_get_translation _bsd_pf_get_translation
@@ -3542,6 +3541,7 @@
 #define	r21au_scan_end _bsd_r21au_scan_end
 #define	r21au_scan_start _bsd_r21au_scan_start
 #define	r88e_beacon_enable _bsd_r88e_beacon_enable
+#define	r88e_classify_intr _bsd_r88e_classify_intr
 #define	r88e_fw_cmd _bsd_r88e_fw_cmd
 #define	r88e_fw_download_enable _bsd_r88e_fw_download_enable
 #define	r88e_fw_reset _bsd_r88e_fw_reset
@@ -3550,11 +3550,10 @@
 #define	r88e_get_rx_stats _bsd_r88e_get_rx_stats
 #define	r88e_get_txpower _bsd_r88e_get_txpower
 #define	r88e_handle_c2h_report _bsd_r88e_handle_c2h_report
-#define	r88e_init_bb _bsd_r88e_init_bb
+#define	r88e_init_bb_common _bsd_r88e_init_bb_common
 #define	r88e_iq_calib _bsd_r88e_iq_calib
 #define	r88e_macid_enable_link _bsd_r88e_macid_enable_link
 #define	r88e_parse_rom _bsd_r88e_parse_rom
-#define	r88e_power_on _bsd_r88e_power_on
 #define	r88e_ratectl_tx_complete _bsd_r88e_ratectl_tx_complete
 #define	r88e_rf_write _bsd_r88e_rf_write
 #define	r88e_set_bw20 _bsd_r88e_set_bw20
@@ -3569,22 +3568,24 @@
 #define	r88e_tx_setup_hwseq _bsd_r88e_tx_setup_hwseq
 #define	r88e_tx_setup_macid _bsd_r88e_tx_setup_macid
 #define	r88eu_attach _bsd_r88eu_attach
-#define	r88eu_classify_intr _bsd_r88eu_classify_intr
+#define	r88eu_init_bb _bsd_r88eu_init_bb
 #define	r88eu_init_intr _bsd_r88eu_init_intr
 #define	r88eu_init_rx_agg _bsd_r88eu_init_rx_agg
 #define	r88eu_post_init _bsd_r88eu_post_init
 #define	r88eu_power_off _bsd_r88eu_power_off
+#define	r88eu_power_on _bsd_r88eu_power_on
 #define	r92c_beacon_enable _bsd_r92c_beacon_enable
 #define	r92c_beacon_init _bsd_r92c_beacon_init
 #define	r92c_check_condition _bsd_r92c_check_condition
+#define	r92c_classify_intr _bsd_r92c_classify_intr
 #define	r92c_detach_private _bsd_r92c_detach_private
 #define	r92ce_attach _bsd_r92ce_attach
-#define	r92ce_classify_intr _bsd_r92ce_classify_intr
 #define	r92ce_copy_tx_desc _bsd_r92ce_copy_tx_desc
 #define	r92ce_dump_tx_desc _bsd_r92ce_dump_tx_desc
 #define	r92ce_enable_intr _bsd_r92ce_enable_intr
 #define	r92c_efuse_postread _bsd_r92c_efuse_postread
 #define	r92ce_fw_reset _bsd_r92ce_fw_reset
+#define	r92ce_get_intr_status _bsd_r92ce_get_intr_status
 #define	r92ce_init_ampdu _bsd_r92ce_init_ampdu
 #define	r92ce_init_bb _bsd_r92ce_init_bb
 #define	r92ce_init_edca _bsd_r92ce_init_edca
@@ -3641,7 +3642,6 @@
 #define	r92c_tx_setup_macid _bsd_r92c_tx_setup_macid
 #define	r92cu_align_rx _bsd_r92cu_align_rx
 #define	r92cu_attach _bsd_r92cu_attach
-#define	r92cu_classify_intr _bsd_r92cu_classify_intr
 #define	r92cu_dump_tx_desc _bsd_r92cu_dump_tx_desc
 #define	r92cu_init_bb _bsd_r92cu_init_bb
 #define	r92cu_init_intr _bsd_r92cu_init_intr
@@ -4702,7 +4702,6 @@
 #define	sysctl___kern_features _bsd_sysctl___kern_features
 #define	sysctl___kern_ipc _bsd_sysctl___kern_ipc
 #define	sysctl_move_oid _bsd_sysctl_move_oid
-#define	sysctl_msec_to_sbintime _bsd_sysctl_msec_to_sbintime
 #define	sysctl_msec_to_ticks _bsd_sysctl_msec_to_ticks
 #define	sysctl___net _bsd_sysctl___net
 #define	sysctl___net_accf _bsd_sysctl___net_accf
@@ -4756,7 +4755,6 @@
 #define	sysctl_wire_old_buffer _bsd_sysctl_wire_old_buffer
 #define	sysctl_wlock _bsd_sysctl_wlock
 #define	sysctl_wunlock _bsd_sysctl_wunlock
-#define	sys_listen _bsd_sys_listen
 #define	system_base_info _bsd_system_base_info
 #define	taskqgroup_adjust _bsd_taskqgroup_adjust
 #define	taskqgroup_attach _bsd_taskqgroup_attach
@@ -5016,7 +5014,6 @@
 #define	ttyoutq_write _bsd_ttyoutq_write
 #define	ttyoutq_write_nofrag _bsd_ttyoutq_write_nofrag
 #define	tty_putchar _bsd_tty_putchar
-#define	tty_putstrn _bsd_tty_putstrn
 #define	tty_rel_gone _bsd_tty_rel_gone
 #define	tty_rel_pgrp _bsd_tty_rel_pgrp
 #define	tty_rel_sess _bsd_tty_rel_sess
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
index 355aff78..a4712ccd 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
@@ -503,6 +503,7 @@
 #define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems */
 #define	USB_VENDOR_SHANTOU	0x0a46		/* ShanTou */
 #define	USB_VENDOR_MEDIAGEAR	0x0a48		/* MediaGear */
+#define	USB_VENDOR_PLOYTEC	0x0a4a		/* Ploytec GmbH */
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom */
 #define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_MEDELI	0x0a67		/* Medeli */
@@ -2767,8 +2768,6 @@
 #define	USB_PRODUCT_LENOVO_GIGALAN	0x304b		/* USB 3.0 Ethernet */
 #define	USB_PRODUCT_LENOVO_ETHERNET	0x7203		/* USB 2.0 Ethernet */
 #define	USB_PRODUCT_LENOVO_RTL8153	0x7205		/* USB 3.0 Ethernet */
-#define	USB_PRODUCT_LENOVO_TBT3LAN	0x3069		/* LAN port in Thinkpad TB3 dock */
-#define	USB_PRODUCT_LENOVO_USBCLAN	0x3062		/* LAN port in Thinkpad USB-C dock */
 
 /* Lexar products */
 #define	USB_PRODUCT_LEXAR_JUMPSHOT	0x0001		/* jumpSHOT CompactFlash Reader */
@@ -3698,6 +3697,9 @@
 /* Plextor Corp. */
 #define	USB_PRODUCT_PLEXTOR_40_12_40U	0x0011		/* PlexWriter 40/12/40U */
 
+/* Ploytec GmbH */
+#define	USB_PRODUCT_PLOYTEC_SPL_CRIMSON_1	0xc150		/* SPL Crimson Revision 1 */
+
 /* PLX products */
 #define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
 #define	USB_PRODUCT_PLX_CA42	0xac70		/* CA-42 */
@@ -4351,6 +4353,7 @@
 #define	USB_PRODUCT_SITECOMEU_RT3072_5	0x004a		/* RT3072 */
 #define	USB_PRODUCT_SITECOMEU_WL349V1	0x004b		/* WL-349 v1 */
 #define	USB_PRODUCT_SITECOMEU_RT3072_6	0x004d		/* RT3072 */
+#define	USB_PRODUCT_SITECOMEU_WLA1000	0x005b		/* WLA-1000 */
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU_1	0x0052		/* RTL8188CU */
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU_2	0x005c		/* RTL8188CU */
 #define	USB_PRODUCT_SITECOMEU_RTL8192CU	0x0061		/* RTL8192CU */
@@ -4614,9 +4617,12 @@
 
 /* TP-Link products */
 #define	USB_PRODUCT_TPLINK_T4U	0x0101		/* Archer T4U */
+#define	USB_PRODUCT_TPLINK_WN821NV5	0x0107		/* TL-WN821N v5 */
 #define	USB_PRODUCT_TPLINK_WN822NV4	0x0108		/* TL-WN822N v4 */
 #define	USB_PRODUCT_TPLINK_WN823NV2	0x0109		/* TL-WN823N v2 */
+#define	USB_PRODUCT_TPLINK_WN722NV2	0x010c		/* TL-WN722N v2 */
 #define	USB_PRODUCT_TPLINK_T4UV2	0x010d		/* Archer T4U ver 2 */
+#define	USB_PRODUCT_TPLINK_T4UHV1	0x0103		/* Archer T4UH ver 1 */
 #define	USB_PRODUCT_TPLINK_T4UHV2	0x010e		/* Archer T4UH ver 2 */
 #define	USB_PRODUCT_TPLINK_RTL8153	0x0601		/* RTL8153 USB 10/100/1000 LAN */
 
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
index bd86ed5c..86bd6aea 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
@@ -8762,18 +8762,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB 3.0 Ethernet",
 	},
 	{
-	    USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_TBT3LAN,
-	    0,
-	    "Lenovo",
-	    "LAN port in Thinkpad TB3 dock",
-	},
-	{
-	    USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_USBCLAN,
-	    0,
-	    "Lenovo",
-	    "LAN port in Thinkpad USB-C dock",
-	},
-	{
 	    USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT,
 	    0,
 	    "Lexar Media",
@@ -13292,6 +13280,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "PlexWriter 40/12/40U",
 	},
 	{
+	    USB_VENDOR_PLOYTEC, USB_PRODUCT_PLOYTEC_SPL_CRIMSON_1,
+	    0,
+	    "Ploytec GmbH",
+	    "SPL Crimson Revision 1",
+	},
+	{
 	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
 	    0,
 	    "PLX",
@@ -16568,6 +16562,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WLA1000,
+	    0,
+	    "Sitecom Europe",
+	    "WLA-1000",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RTL8188CU_1,
 	    0,
 	    "Sitecom Europe",
@@ -17588,6 +17588,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Archer T4U",
 	},
 	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN821NV5,
+	    0,
+	    "TP-Link",
+	    "TL-WN821N v5",
+	},
+	{
 	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN822NV4,
 	    0,
 	    "TP-Link",
@@ -17600,12 +17606,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "TL-WN823N v2",
 	},
 	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN722NV2,
+	    0,
+	    "TP-Link",
+	    "TL-WN722N v2",
+	},
+	{
 	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4UV2,
 	    0,
 	    "TP-Link",
 	    "Archer T4U ver 2",
 	},
 	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4UHV1,
+	    0,
+	    "TP-Link",
+	    "Archer T4UH ver 1",
+	},
+	{
 	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4UHV2,
 	    0,
 	    "TP-Link",
@@ -21404,6 +21422,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PLOYTEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Ploytec GmbH",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BROADCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Broadcom",