summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsephe <sephe@FreeBSD.org>2016-11-14 05:24:05 +0000
committersephe <sephe@FreeBSD.org>2016-11-14 05:24:05 +0000
commit73ba7084f5f6de3adfd70e5a6e5f6a2c9b686a7f (patch)
tree48ee4b5d770fe7eaa7738a5bcc4ed37a0274d84b
parent0ef133301b2702f9e6d743957e12414ff2568b9f (diff)
downloadFreeBSD-src-73ba7084f5f6de3adfd70e5a6e5f6a2c9b686a7f.zip
FreeBSD-src-73ba7084f5f6de3adfd70e5a6e5f6a2c9b686a7f.tar.gz
MFC 308018,308116
308018 hyeprv/hn: Rename cleaned up RNDIS header file. Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D8360 308116 hyperv/hn: Rename cleaned up RNDIS source file. Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D8361
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/dev/hyperv/netvsc/hn_rndis.c (renamed from sys/dev/hyperv/netvsc/hv_rndis_filter.c)2
-rw-r--r--sys/dev/hyperv/netvsc/hn_rndis.h (renamed from sys/dev/hyperv/netvsc/hv_rndis_filter.h)0
-rw-r--r--sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c2
-rw-r--r--sys/modules/hyperv/netvsc/Makefile4
6 files changed, 5 insertions, 7 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 411b536..55fd66f 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -292,8 +292,8 @@ dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_tsc.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/hyperv/netvsc/hn_nvs.c optional hyperv
+dev/hyperv/netvsc/hn_rndis.c optional hyperv
dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
-dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 5136f97..0e40ea6 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -249,8 +249,8 @@ dev/hwpmc/hwpmc_ppro.c optional hwpmc
dev/hwpmc/hwpmc_tsc.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/hyperv/netvsc/hn_nvs.c optional hyperv
+dev/hyperv/netvsc/hn_rndis.c optional hyperv
dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
-dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
diff --git a/sys/dev/hyperv/netvsc/hv_rndis_filter.c b/sys/dev/hyperv/netvsc/hn_rndis.c
index 1895a42..08314a2 100644
--- a/sys/dev/hyperv/netvsc/hv_rndis_filter.c
+++ b/sys/dev/hyperv/netvsc/hn_rndis.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hyperv/netvsc/if_hnreg.h>
#include <dev/hyperv/netvsc/if_hnvar.h>
#include <dev/hyperv/netvsc/hn_nvs.h>
-#include <dev/hyperv/netvsc/hv_rndis_filter.h>
+#include <dev/hyperv/netvsc/hn_rndis.h>
#define HN_RNDIS_RID_COMPAT_MASK 0xffff
#define HN_RNDIS_RID_COMPAT_MAX HN_RNDIS_RID_COMPAT_MASK
diff --git a/sys/dev/hyperv/netvsc/hv_rndis_filter.h b/sys/dev/hyperv/netvsc/hn_rndis.h
index 736df34..736df34 100644
--- a/sys/dev/hyperv/netvsc/hv_rndis_filter.h
+++ b/sys/dev/hyperv/netvsc/hn_rndis.h
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index 5a95a2e..c54acb7 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -125,7 +125,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hyperv/netvsc/if_hnreg.h>
#include <dev/hyperv/netvsc/if_hnvar.h>
#include <dev/hyperv/netvsc/hn_nvs.h>
-#include <dev/hyperv/netvsc/hv_rndis_filter.h>
+#include <dev/hyperv/netvsc/hn_rndis.h>
#include "vmbus_if.h"
diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile
index ab80820..b27ea40 100644
--- a/sys/modules/hyperv/netvsc/Makefile
+++ b/sys/modules/hyperv/netvsc/Makefile
@@ -4,9 +4,7 @@
${.CURDIR}/../../../dev/hyperv/vmbus
KMOD= hv_netvsc
-SRCS= hn_nvs.c \
- hv_netvsc_drv_freebsd.c \
- hv_rndis_filter.c
+SRCS= hn_nvs.c hn_rndis.c hv_netvsc_drv_freebsd.c
SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h vmbus_if.h
CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/netvsc
OpenPOWER on IntegriCloud