svn commit: r289345 - head/sys/dev/ntb/if_ntb

[Conrad E. Meyer]

Author: cem
Date: Wed Oct 14 23:47:35 2015
New Revision: 289345
URL: https://svnweb.freebsd.org/changeset/base/289345

Log:
  NTB: MFV a1413cfb: correct the spread of queues over mw's
  
  The detection of an uneven number of queues on the given memory windows
  was not correct.  The mw_num is zero based and the mod should be
  division to spread them evenly over the mw's.
  
  Authored by:	Jon Mason
  Obtained from:	Linux (Dual BSD/GPL driver)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/ntb/if_ntb/if_ntb.c

Modified: head/sys/dev/ntb/if_ntb/if_ntb.c
==============================================================================
--- head/sys/dev/ntb/if_ntb/if_ntb.c	Wed Oct 14 23:47:23 2015	(r289344)
+++ head/sys/dev/ntb/if_ntb/if_ntb.c	Wed Oct 14 23:47:35 2015	(r289345)
@@ -566,7 +566,7 @@ ntb_transport_init_queue(struct ntb_netd
 	qp->client_ready = NTB_LINK_DOWN;
 	qp->event_handler = NULL;
 
-	if (nt->max_qps % NTB_NUM_MW && mw_num < nt->max_qps % NTB_NUM_MW)
+	if (nt->max_qps % NTB_NUM_MW && mw_num + 1 < nt->max_qps / NTB_NUM_MW)
 		num_qps_mw = nt->max_qps / NTB_NUM_MW + 1;
 	else
 		num_qps_mw = nt->max_qps / NTB_NUM_MW;
@@ -1197,7 +1197,7 @@ ntb_transport_setup_qp_mw(struct ntb_net
 	uint8_t mw_num = QP_TO_MW(qp_num);
 	unsigned int i;
 
-	if (nt->max_qps % NTB_NUM_MW && mw_num < nt->max_qps % NTB_NUM_MW)
+	if (nt->max_qps % NTB_NUM_MW && mw_num + 1 < nt->max_qps / NTB_NUM_MW)
 		num_qps_mw = nt->max_qps / NTB_NUM_MW + 1;
 	else
 		num_qps_mw = nt->max_qps / NTB_NUM_MW;