diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 792f0ff24e8a..9ba91504852b 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,200 +1,199 @@
 # Makefile for libpcap
 
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
 LIB=	pcap
 
 SRCS=	bpf_dump.c \
 	bpf_filter.c \
 	bpf_image.c \
 	etherent.c \
 	fad-getad.c \
 	fmtutils.c \
 	gencode.c \
 	grammar.y \
 	nametoaddr.c \
 	optimize.c \
 	pcap-bpf.c \
 	pcap-common.c \
 	pcap-netmap.c \
-	pcap-usb-linux-common.c \
 	pcap-util.c \
 	pcap.c \
 	savefile.c \
 	scanner.l \
 	sf-pcap.c \
 	sf-pcapng.c \
 	tokdefs.h
 
 # Old compatibility headers
 INCS=	pcap-bpf.h \
 	pcap-namedb.h \
 	pcap-netmap.h \
 	pcap.h
 
 PCAPINCS= \
 	pcap/bluetooth.h \
 	pcap/bpf.h \
 	pcap/can_socketcan.h \
 	pcap/compiler-tests.h \
 	pcap/dlt.h \
 	pcap/funcattrs.h \
 	pcap/ipnet.h \
 	pcap/namedb.h \
 	pcap/nflog.h \
 	pcap/pcap-inttypes.h \
 	pcap/pcap.h \
 	pcap/socket.h \
 	pcap/sll.h \
 	pcap/usb.h \
 	pcap/vlan.h
 
 PCAPINCSDIR=	${INCLUDEDIR}/pcap
 INCSGROUPS=	INCS PCAPINCS
 
 MAN=	pcap.3 \
 	pcap_activate.3 \
 	pcap_breakloop.3 \
 	pcap_can_set_rfmon.3 \
 	pcap_close.3 \
 	pcap_compile.3 \
 	pcap_create.3 \
 	pcap_datalink.3 \
 	pcap_datalink_name_to_val.3 \
 	pcap_datalink_val_to_name.3 \
 	pcap_dump.3 \
 	pcap_dump_close.3 \
 	pcap_dump_file.3 \
 	pcap_dump_flush.3 \
 	pcap_dump_ftell.3 \
 	pcap_dump_open.3 \
 	pcap_file.3 \
 	pcap_fileno.3 \
 	pcap_findalldevs.3 \
 	pcap_freecode.3 \
 	pcap_get_required_select_timeout.3 \
 	pcap_get_selectable_fd.3 \
 	pcap_get_tstamp_precision.3 \
 	pcap_geterr.3 \
 	pcap_init.3 \
 	pcap_inject.3 \
 	pcap_is_swapped.3 \
 	pcap_lib_version.3 \
 	pcap_list_datalinks.3 \
 	pcap_list_tstamp_types.3 \
 	pcap_lookupdev.3 \
 	pcap_lookupnet.3 \
 	pcap_loop.3 \
 	pcap_major_version.3 \
 	pcap_next_ex.3 \
 	pcap_offline_filter.3 \
 	pcap_open_dead.3 \
 	pcap_open_live.3 \
 	pcap_open_offline.3 \
 	pcap_set_buffer_size.3 \
 	pcap_set_datalink.3 \
 	pcap_set_promisc.3 \
 	pcap_set_rfmon.3 \
 	pcap_set_snaplen.3 \
 	pcap_set_timeout.3 \
 	pcap_set_tstamp_precision.3 \
 	pcap_set_tstamp_type.3 \
 	pcap_setdirection.3 \
 	pcap_setfilter.3 \
 	pcap_setnonblock.3 \
 	pcap_snapshot.3 \
 	pcap_stats.3 \
 	pcap_statustostr.3 \
 	pcap_strerror.3 \
 	pcap_tstamp_type_name_to_val.3 \
 	pcap_tstamp_type_val_to_name.3 \
 	pcap-savefile.5 \
 	pcap-filter.7 \
 	pcap-linktype.7 \
 	pcap-tstamp.7
 
 MLINKS= \
 	pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \
 	pcap_dump_open.3 pcap_dump_fopen.3 \
 	pcap_findalldevs.3 pcap_freealldevs.3 \
 	pcap_geterr.3 pcap_perror.3 \
 	pcap_inject.3 pcap_sendpacket.3 \
 	pcap_list_datalinks.3 pcap_free_datalinks.3 \
 	pcap_list_tstamp_types.3 pcap_free_tstamp_types.3 \
 	pcap_loop.3 pcap_dispatch.3 \
 	pcap_major_version.3 pcap_minor_version.3 \
 	pcap_next_ex.3 pcap_next.3 \
 	pcap_open_offline.3 pcap_fopen_offline.3 \
 	pcap_setnonblock.3 pcap_getnonblock.3
 
 # Our man pages are a special copy from the distdir. See below.
 CLEANFILES+=${MAN}
 CLEANFILES+=grammar.y scanner.h tokdefs.h
 
 YFLAGS+=-p pcap_
 LFLAGS+=-Ppcap_ --header-file=${.OBJDIR}/scanner.h --nounput
 CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR}
 CFLAGS+=-D_U_="__attribute__((unused))"
 CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 CFLAGS+=-DBUILDING_PCAP
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 .if ${MK_PF} != "no"
 CFLAGS+=-DHAVE_NET_PFVAR_H
 .endif
 
 CFLAGS+= -DPCAP_SUPPORT_NETMAP
 
 .if ${MK_OFED} != "no"
 SRCS+= pcap-rdmasniff.c
 LIBADD+= ibverbs
 LIBADD+= mlx5
 CFLAGS+= -DPCAP_SUPPORT_RDMASNIFF
 .endif
 
 WARNS?=	0
 
 SHLIB_MAJOR=	8
 
 #
 # Magic to grab sources out of src/contrib
 #
 PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap
 CFLAGS+=-I${PCAP_DISTDIR}
 .PATH:	${PCAP_DISTDIR}
 .PATH:	${PCAP_DISTDIR}/bpf/net
 
 grammar.y: grammar.y.in
 	sed  -e 's/@REENTRANT_PARSER@/%pure-parser/' < ${.ALLSRC} > ${.TARGET}
 
 tokdefs.h: grammar.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 #
 # Magic to convert the man pages to something non Solarish
 #
 .for _page in ${MAN}
 ${_page}:
 	if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then		\
 		F=${_page:S/3$/3pcap/}; 				\
 	elif [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap.in/} ]; then	\
 		F=${_page:S/3$/3pcap.in/}; 				\
 	elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile.in/} ]; then	\
 		F=${_page:S/5$/manfile.in/};				\
 	elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then	\
 		F=${_page:S/5$/manfile/};				\
 	else								\
 		F=${_page:S/7$/manmisc.in/};				\
 	fi;								\
 	sed \
 		-e 's/3PCAP/3/g' \
 		-e 's/@MAN_FILE_FORMATS@/5/g' \
 		-e 's/@MAN_MISC_INFO@/7/g' \
 		-e 's/@MAN_ADMIN_COMMANDS@/8/g' \
 		${PCAP_DISTDIR}/$$F > ${_page}
 .endfor
 
 .include <bsd.lib.mk>
diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index 132b9bb29183..cea0cc4fd7cb 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,222 +1,222 @@
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the `asprintf' function. */
 #define HAVE_ASPRINTF 1
 
 /* Define to 1 if you have the `ether_hostton' function. */
 #define HAVE_ETHER_HOSTTON 1
 
 /* Define to 1 if you have the `ffs' function. */
 #define HAVE_FFS 1
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
 /* on HP-UX 10.20 or later */
 /* #undef HAVE_HPUX10_20_OR_LATER */
 
 /* on HP-UX 9.x */
 /* #undef HAVE_HPUX9 */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
 /* if libdlpi exists */
 /* #undef HAVE_LIBDLPI */
 
 /* if libnl exists */
 /* #undef HAVE_LIBNL */
 
 /* if libnl exists and is version 2.x */
 /* #undef HAVE_LIBNL_2_x */
 
 /* if libnl exists and is version 3.x */
 /* #undef HAVE_LIBNL_3_x */
 
 /* libnl has NLE_FAILURE */
 /* #undef HAVE_LIBNL_NLE */
 
 /* libnl has new-style socket api */
 /* #undef HAVE_LIBNL_SOCKETS */
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
 /* Define to 1 if you have the <linux/compiler.h> header file. */
 /* #undef HAVE_LINUX_COMPILER_H */
 
 /* Define to 1 if you have the <linux/ethtool.h> header file. */
 /* #undef HAVE_LINUX_ETHTOOL_H */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the <netpacket/packet.h> header file. */
 /* #undef HAVE_NETPACKET_PACKET_H */
 
 /* Define to 1 if you have the <net/bpf.h> header file. */
 #define HAVE_NET_BPF_H 1
 
 /* Define to 1 if you have the <net/if_media.h> header file. */
 #define HAVE_NET_IF_MEDIA_H 1
 
 /* Define to 1 if you have the <net/pfvar.h> header file. */
 /* See Makefile */
 /* #undef HAVE_NET_PFVAR_H */
 
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 /* #undef HAVE_OS_PROTO_H */
 
 /* define if net/pfvar.h defines PF_NAT through PF_NORDR */
 #define HAVE_PF_NAT_THROUGH_PF_NORDR 1
 
 /* define if you have the Septel API */
 /* #undef HAVE_SEPTEL_API */
 
 /* define if you have the Myricom SNF API */
 /* #undef HAVE_SNF_API */
 
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
 /* Define to 1 if you have the `strerror_r' function. */
 #define HAVE_STRERROR_R 1
 
 /* Define to 1 if you have the `strerror_s' function. */
 /* #undef HAVE_STRERROR_S */
 
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the `strlcat' function. */
 #define HAVE_STRLCAT 1
 
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
 /* Define to 1 if you have the `strtok_r' function. */
 #define HAVE_STRTOK_R 1
 
 /* Define to 1 if the system has the type `struct BPF_TIMEVAL'. */
 /* #undef HAVE_STRUCT_BPF_TIMEVAL */
 
 /* Define to 1 if the system has the type `struct ether_addr'. */
 /* #undef HAVE_STRUCT_ETHER_ADDR */
 
 /* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
 
 /* Define to 1 if the system has the type `struct sockaddr_storage'. */
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 
 /* Define to 1 if you have the <sys/bufmod.h> header file. */
 /* #undef HAVE_SYS_BUFMOD_H */
 
 /* Define to 1 if you have the <sys/dlpi_ext.h> header file. */
 /* #undef HAVE_SYS_DLPI_EXT_H */
 
 /* Define to 1 if you have the <sys/ioccom.h> header file. */
 #define HAVE_SYS_IOCCOM_H 1
 
 /* Define to 1 if you have the <sys/select.h> header file. */
 #define HAVE_SYS_SELECT_H 1
 
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #define HAVE_SYS_SOCKIO_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
 /* define if you have the TurboCap API */
 /* #undef HAVE_TC_API */
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
 /* IPv6 */
 /* See Makefile */
 /* #undef INET6 */
 
 /* if unaligned access fails */
 /* #undef LBL_ALIGN */
 
 /* path for device for USB sniffing */
 /* #undef LINUX_USB_MON_DEV */
 
 /* Define to 1 if netinet/ether.h declares `ether_hostton' */
 /* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */
 
 /* Define to 1 if netinet/if_ether.h declares `ether_hostton' */
 #define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/
 
 /* do not use protochain */
 /* #undef NO_PROTOCHAIN */
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "pcap"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pcap 1.10.4"
+#define PACKAGE_STRING "pcap 1.10.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcap"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.10.4"
+#define PACKAGE_VERSION "1.10.5"
 
 /* target host supports netmap */
 #define PCAP_SUPPORT_NETMAP 1
 
 /* use packet ring capture support on Linux if available */
 #define PCAP_SUPPORT_PACKET_RING 1
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define to 1 if strings.h declares `ffs' */
 #define STRINGS_H_DECLARES_FFS /**/
 
 /* Enable parser debugging */
 /* #undef YYDEBUG */
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
 #define YYTEXT_POINTER 1
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
 
 /* Define as token for inline if inlining supported */
 #define inline inline