svn commit: r308016 - head/sys/dev/hyperv/netvsc
Sepherosa Ziehau
sephe at FreeBSD.org
Fri Oct 28 08:32:55 UTC 2016
Author: sephe
Date: Fri Oct 28 08:32:54 2016
New Revision: 308016
URL: https://svnweb.freebsd.org/changeset/base/308016
Log:
hyperv/hn: Cleanup RNDIS related files.
MFC after: 1 week
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8358
Modified:
head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
head/sys/dev/hyperv/netvsc/hv_rndis_filter.h
head/sys/dev/hyperv/netvsc/if_hnvar.h
Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c Fri Oct 28 08:18:49 2016 (r308015)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c Fri Oct 28 08:32:54 2016 (r308016)
@@ -29,11 +29,12 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_inet6.h"
+#include "opt_inet.h"
+
#include <sys/param.h>
-#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
+#include <sys/systm.h>
#include <sys/taskqueue.h>
#include <machine/atomic.h>
@@ -76,19 +77,23 @@ __FBSDID("$FreeBSD$");
#define HN_NDIS_LSOV2_CAP_IP6 \
(NDIS_LSOV2_CAP_IP6EXT | NDIS_LSOV2_CAP_TCP6OPT)
-/*
- * Forward declarations
- */
-static int hn_rndis_query(struct hn_softc *sc, uint32_t oid,
- const void *idata, size_t idlen, void *odata, size_t *odlen0);
-static int hn_rndis_query2(struct hn_softc *sc, uint32_t oid,
- const void *idata, size_t idlen, void *odata, size_t *odlen0,
- size_t min_odlen);
-static int hn_rndis_set(struct hn_softc *sc, uint32_t oid, const void *data,
- size_t dlen);
-static int hn_rndis_conf_offload(struct hn_softc *sc, int mtu);
-static int hn_rndis_query_hwcaps(struct hn_softc *sc,
- struct ndis_offload *caps);
+static const void *hn_rndis_xact_exec1(struct hn_softc *,
+ struct vmbus_xact *, size_t,
+ struct hn_nvs_sendctx *, size_t *);
+static const void *hn_rndis_xact_execute(struct hn_softc *,
+ struct vmbus_xact *, uint32_t, size_t, size_t *,
+ uint32_t);
+static int hn_rndis_query(struct hn_softc *, uint32_t,
+ const void *, size_t, void *, size_t *);
+static int hn_rndis_query2(struct hn_softc *, uint32_t,
+ const void *, size_t, void *, size_t *, size_t);
+static int hn_rndis_set(struct hn_softc *, uint32_t,
+ const void *, size_t);
+static int hn_rndis_init(struct hn_softc *);
+static int hn_rndis_halt(struct hn_softc *);
+static int hn_rndis_conf_offload(struct hn_softc *, int);
+static int hn_rndis_query_hwcaps(struct hn_softc *,
+ struct ndis_offload *);
static __inline uint32_t
hn_rndis_rid(struct hn_softc *sc)
Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.h Fri Oct 28 08:18:49 2016 (r308015)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.h Fri Oct 28 08:32:54 2016 (r308016)
@@ -33,6 +33,16 @@
struct hn_softc;
+int hn_rndis_attach(struct hn_softc *sc, int mtu);
+void hn_rndis_detach(struct hn_softc *sc);
+int hn_rndis_conf_rss(struct hn_softc *sc, uint16_t flags);
+int hn_rndis_query_rsscaps(struct hn_softc *sc, int *rxr_cnt);
+int hn_rndis_get_eaddr(struct hn_softc *sc, uint8_t *eaddr);
+/* link_status: NDIS_MEDIA_STATE_ */
+int hn_rndis_get_linkstatus(struct hn_softc *sc,
+ uint32_t *link_status);
+/* filter: NDIS_PACKET_TYPE_. */
+int hn_rndis_set_rxfilter(struct hn_softc *sc, uint32_t filter);
void hn_rndis_rx_ctrl(struct hn_softc *sc, const void *data,
int dlen);
Modified: head/sys/dev/hyperv/netvsc/if_hnvar.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/if_hnvar.h Fri Oct 28 08:18:49 2016 (r308015)
+++ head/sys/dev/hyperv/netvsc/if_hnvar.h Fri Oct 28 08:32:54 2016 (r308016)
@@ -231,14 +231,4 @@ struct hn_softc {
#define HN_LINK_FLAG_LINKUP 0x0001
#define HN_LINK_FLAG_NETCHG 0x0002
-int hn_rndis_attach(struct hn_softc *sc, int mtu);
-void hn_rndis_detach(struct hn_softc *sc);
-int hn_rndis_conf_rss(struct hn_softc *sc, uint16_t flags);
-int hn_rndis_query_rsscaps(struct hn_softc *sc, int *rxr_cnt);
-int hn_rndis_get_eaddr(struct hn_softc *sc, uint8_t *eaddr);
-int hn_rndis_get_linkstatus(struct hn_softc *sc,
- uint32_t *link_status);
-/* filter: NDIS_PACKET_TYPE_. */
-int hn_rndis_set_rxfilter(struct hn_softc *sc, uint32_t filter);
-
#endif /* !_IF_HNVAR_H_ */
More information about the svn-src-head
mailing list