diff options
author | Sepherosa Ziehau <sephe@FreeBSD.org> | 2016-11-28 06:40:26 +0000 |
---|---|---|
committer | Sepherosa Ziehau <sephe@FreeBSD.org> | 2016-11-28 06:40:26 +0000 |
commit | afd4971b7bef60a447fcaba9ba6d19423d33395c (patch) | |
tree | 55286a75cf8896426c4700b000b9811102c9edd9 /sys/dev/hyperv/netvsc | |
parent | 3611de44efddb2128781f74ec8b2138b664d7c79 (diff) | |
download | src-afd4971b7bef60a447fcaba9ba6d19423d33395c.tar.gz src-afd4971b7bef60a447fcaba9ba6d19423d33395c.zip |
hyperv/hn: Simplify RSS indirect table fixup API
MFC after: 1 week
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8630
Notes
Notes:
svn path=/head/; revision=309235
Diffstat (limited to 'sys/dev/hyperv/netvsc')
-rw-r--r-- | sys/dev/hyperv/netvsc/if_hn.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 10d9471152b3..ed7b0433c9d8 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -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_set_rxfilter(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 *, int, const struct hn_rxinfo *); @@ -817,11 +817,12 @@ hn_rss_reconfig(struct hn_softc *sc) } 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; - int i; + int i, nchan; + nchan = sc->hn_rx_ring_inuse; KASSERT(nchan > 1, ("invalid # of channels %d", nchan)); /* @@ -2943,7 +2944,7 @@ hn_rss_ind_sysctl(SYSCTL_HANDLER_ARGS) goto back; 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); back: HN_UNLOCK(sc); @@ -4502,6 +4503,8 @@ hn_synth_attach(struct hn_softc *sc, int mtu) /* * Attach the sub-channels. + * + * NOTE: hn_set_ring_inuse() _must_ have been called. */ error = hn_attach_subchans(sc); 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 * make sure that all entries in RSS indirect table * 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); |