aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/hyperv/netvsc
diff options
context:
space:
mode:
authorSepherosa Ziehau <sephe@FreeBSD.org>2016-10-28 07:59:02 +0000
committerSepherosa Ziehau <sephe@FreeBSD.org>2016-10-28 07:59:02 +0000
commit96a98cbf141c199bd2cf30330a3db284258995b9 (patch)
tree751e085d4feb63dda958d6b31a87d396774e23bd /sys/dev/hyperv/netvsc
parent68468712a76687af02803b52641122d4b2c79b2a (diff)
Notes
Diffstat (limited to 'sys/dev/hyperv/netvsc')
-rw-r--r--sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c5
-rw-r--r--sys/dev/hyperv/netvsc/hv_rndis_filter.c7
-rw-r--r--sys/dev/hyperv/netvsc/hv_rndis_filter.h2
-rw-r--r--sys/dev/hyperv/netvsc/if_hnvar.h1
4 files changed, 3 insertions, 12 deletions
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index f34ed18e50c83..026af419cafd0 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -358,6 +358,7 @@ static void hn_chan_detach(struct hn_softc *, struct vmbus_channel *);
static int hn_attach_subchans(struct hn_softc *);
static void hn_detach_allchans(struct hn_softc *);
static void hn_chan_callback(struct vmbus_channel *chan, void *xrxr);
+static void hn_chan_rollup(struct hn_rx_ring *, struct hn_tx_ring *);
static void hn_set_ring_inuse(struct hn_softc *, int);
static int hn_synth_attach(struct hn_softc *, int);
static void hn_synth_detach(struct hn_softc *);
@@ -1188,7 +1189,7 @@ hn_tx_done(struct hn_nvs_sendctx *sndc, struct hn_softc *sc,
}
}
-void
+static void
hn_chan_rollup(struct hn_rx_ring *rxr, struct hn_tx_ring *txr)
{
#if defined(INET) || defined(INET6)
@@ -4213,7 +4214,7 @@ hn_chan_callback(struct vmbus_channel *chan, void *xrxr)
if (bufferlen > HN_PKTBUF_LEN)
free(buffer, M_DEVBUF);
- hv_rf_channel_rollup(rxr, rxr->hn_txr);
+ hn_chan_rollup(rxr, rxr->hn_txr);
}
static void
diff --git a/sys/dev/hyperv/netvsc/hv_rndis_filter.c b/sys/dev/hyperv/netvsc/hv_rndis_filter.c
index d3ddc38d23a71..8f77129696de5 100644
--- a/sys/dev/hyperv/netvsc/hv_rndis_filter.c
+++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.c
@@ -1352,10 +1352,3 @@ hn_rndis_detach(struct hn_softc *sc)
/* Halt the RNDIS. */
hn_rndis_halt(sc);
}
-
-void
-hv_rf_channel_rollup(struct hn_rx_ring *rxr, struct hn_tx_ring *txr)
-{
-
- hn_chan_rollup(rxr, txr);
-}
diff --git a/sys/dev/hyperv/netvsc/hv_rndis_filter.h b/sys/dev/hyperv/netvsc/hv_rndis_filter.h
index 3ecda3b80d036..80d8183eef979 100644
--- a/sys/dev/hyperv/netvsc/hv_rndis_filter.h
+++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.h
@@ -42,7 +42,5 @@ struct hn_rx_ring;
void hv_rf_on_receive(struct hn_softc *sc, struct hn_rx_ring *rxr,
const void *data, int dlen);
-void hv_rf_channel_rollup(struct hn_rx_ring *rxr, struct hn_tx_ring *txr);
#endif /* __HV_RNDIS_FILTER_H__ */
-
diff --git a/sys/dev/hyperv/netvsc/if_hnvar.h b/sys/dev/hyperv/netvsc/if_hnvar.h
index a22197a138d10..abd18d565fcdf 100644
--- a/sys/dev/hyperv/netvsc/if_hnvar.h
+++ b/sys/dev/hyperv/netvsc/if_hnvar.h
@@ -258,7 +258,6 @@ int hn_rndis_set_rxfilter(struct hn_softc *sc, uint32_t filter);
int hn_rxpkt(struct hn_rx_ring *rxr, const void *data, int dlen,
const struct hn_recvinfo *info);
-void hn_chan_rollup(struct hn_rx_ring *rxr, struct hn_tx_ring *txr);
void hn_link_status_update(struct hn_softc *sc);
void hn_network_change(struct hn_softc *sc);