svn commit: r308013 - head/sys/dev/hyperv/netvsc

[Sepherosa Ziehau]

Author: sephe
Date: Fri Oct 28 07:59:02 2016
New Revision: 308013
URL: https://svnweb.freebsd.org/changeset/base/308013

Log:
  hyperv/hn: Nuke unnecessary indirection.
  
  MFC after:	1 week
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D8355

Modified:
  head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  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_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Fri Oct 28 07:48:17 2016	(r308012)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Fri Oct 28 07:59:02 2016	(r308013)
@@ -358,6 +358,7 @@ static void hn_chan_detach(struct hn_sof
 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, 
 	}
 }
 
-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 *c
 	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

Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c	Fri Oct 28 07:48:17 2016	(r308012)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c	Fri Oct 28 07:59:02 2016	(r308013)
@@ -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);
-}

Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.h	Fri Oct 28 07:48:17 2016	(r308012)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.h	Fri Oct 28 07:59:02 2016	(r308013)
@@ -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__ */
-

Modified: head/sys/dev/hyperv/netvsc/if_hnvar.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/if_hnvar.h	Fri Oct 28 07:48:17 2016	(r308012)
+++ head/sys/dev/hyperv/netvsc/if_hnvar.h	Fri Oct 28 07:59:02 2016	(r308013)
@@ -258,7 +258,6 @@ int		hn_rndis_set_rxfilter(struct hn_sof
 
 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);