d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/hn: Simplify RSS indirect table fixup API

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D8630
This commit is contained in:
Sepherosa Ziehau 2016-11-28 06:40:26 +00:00
parent 3611de44ef
commit afd4971b7b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=309235
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/hyperv/netvsc/if_hn.c
View File

@ -319,7 +319,7 @@ static void hn_destroy_rx_data(struct hn_softc *);
static int hn_check_iplen(const struct mbuf *, int); static int hn_check_iplen(const struct mbuf *, int);
static int hn_set_rxfilter(struct hn_softc *); static int hn_set_rxfilter(struct hn_softc *);
static int hn_rss_reconfig(struct hn_softc *); static int hn_rss_reconfig(struct hn_softc *);
static void hn_rss_ind_fixup(struct hn_softc *, int); static void hn_rss_ind_fixup(struct hn_softc *);
static int hn_rxpkt(struct hn_rx_ring *, const void *, static int hn_rxpkt(struct hn_rx_ring *, const void *,
int, const struct hn_rxinfo *); int, const struct hn_rxinfo *);
@ -817,11 +817,12 @@ hn_rss_reconfig(struct hn_softc *sc)
} }
static void static void
hn_rss_ind_fixup(struct hn_softc *sc, int nchan) hn_rss_ind_fixup(struct hn_softc *sc)
{ {
struct ndis_rssprm_toeplitz *rss = &sc->hn_rss; struct ndis_rssprm_toeplitz *rss = &sc->hn_rss;
int i; int i, nchan;
nchan = sc->hn_rx_ring_inuse;
KASSERT(nchan > 1, ("invalid # of channels %d", nchan)); KASSERT(nchan > 1, ("invalid # of channels %d", nchan));
/* /*
@ -2943,7 +2944,7 @@ hn_rss_ind_sysctl(SYSCTL_HANDLER_ARGS)
goto back; goto back;
sc->hn_flags |= HN_FLAG_HAS_RSSIND; sc->hn_flags |= HN_FLAG_HAS_RSSIND;
hn_rss_ind_fixup(sc, sc->hn_rx_ring_inuse); hn_rss_ind_fixup(sc);
error = hn_rss_reconfig(sc); error = hn_rss_reconfig(sc);
back: back:
HN_UNLOCK(sc); HN_UNLOCK(sc);
@ -4502,6 +4503,8 @@ hn_synth_attach(struct hn_softc *sc, int mtu)
/* /*
* Attach the sub-channels. * Attach the sub-channels.
*
* NOTE: hn_set_ring_inuse() _must_ have been called.
*/ */
error = hn_attach_subchans(sc); error = hn_attach_subchans(sc);
if (error) if (error)
@ -4538,8 +4541,10 @@ hn_synth_attach(struct hn_softc *sc, int mtu)
* # of usable channels may be changed, so we have to * # of usable channels may be changed, so we have to
* make sure that all entries in RSS indirect table * make sure that all entries in RSS indirect table
* are valid. * are valid.
*
* NOTE: hn_set_ring_inuse() _must_ have been called.
*/ */
hn_rss_ind_fixup(sc, nchan); hn_rss_ind_fixup(sc);
} }
error = hn_rndis_conf_rss(sc, NDIS_RSS_FLAG_NONE); error = hn_rndis_conf_rss(sc, NDIS_RSS_FLAG_NONE);