From owner-svn-src-head@freebsd.org  Mon Aug 29 05:08:54 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8466BC5381;
 Mon, 29 Aug 2016 05:08:54 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7264CEF5;
 Mon, 29 Aug 2016 05:08:54 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7T58riu043081;
 Mon, 29 Aug 2016 05:08:53 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7T58r15043080;
 Mon, 29 Aug 2016 05:08:53 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201608290508.u7T58r15043080@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sephe set sender to
 sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Mon, 29 Aug 2016 05:08:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304976 - head/sys/dev/hyperv/netvsc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Aug 2016 05:08:54 -0000

Author: sephe
Date: Mon Aug 29 05:08:53 2016
New Revision: 304976
URL: https://svnweb.freebsd.org/changeset/base/304976

Log:
  hyperv/hn: Fix # of channels setting, if RSS is not available.
  
  MFC after:	1 week
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D7657

Modified:
  head/sys/dev/hyperv/netvsc/hv_rndis_filter.c

Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c	Mon Aug 29 04:54:13 2016	(r304975)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c	Mon Aug 29 05:08:53 2016	(r304976)
@@ -1377,8 +1377,14 @@ hv_rf_on_device_add(struct hn_softc *sc,
 	
 	dev_info->link_state = rndis_dev->link_status;
 
-	if (sc->hn_ndis_ver < NDIS_VERSION_6_30 || nchan == 1)
+	if (sc->hn_ndis_ver < NDIS_VERSION_6_30 || nchan == 1) {
+		/*
+		 * Either RSS is not supported, or multiple RX/TX rings
+		 * are not requested.
+		 */
+		*nchan0 = 1;
 		return (0);
+	}
 
 	/*
 	 * Get RSS capabilities, e.g. # of RX rings, and # of indirect
@@ -1386,9 +1392,9 @@ hv_rf_on_device_add(struct hn_softc *sc,
 	 */
 	ret = hn_rndis_get_rsscaps(sc, &rxr_cnt);
 	if (ret) {
-		/* This is benign. */
-		ret = 0;
-		goto out;
+		/* No RSS; this is benign. */
+		*nchan0 = 1;
+		return (0);
 	}
 	if (nchan > rxr_cnt)
 		nchan = rxr_cnt;