From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 16 Mar 2015 05:39:41 +0000 (+0000)
Subject: [ncm] Respect maximum transfer size of the bus
X-Git-Tag: v1.20.1~897
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f57016dcec849315f7af52cdc429c676748267;p=thirdparty%2Fipxe.git

[ncm] Respect maximum transfer size of the bus

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/net/ncm.c b/src/drivers/net/ncm.c
index 8620985b3..10728d2a1 100644
--- a/src/drivers/net/ncm.c
+++ b/src/drivers/net/ncm.c
@@ -157,6 +157,7 @@ static struct usb_endpoint_driver_operations ncm_intr_operations = {
  * @ret rc		Return status code
  */
 static int ncm_in_prefill ( struct ncm_device *ncm ) {
+	struct usb_bus *bus = ncm->bus;
 	size_t mtu;
 	unsigned int count;
 	int rc;
@@ -178,6 +179,8 @@ static int ncm_in_prefill ( struct ncm_device *ncm ) {
 		/* Attempt allocation at this MTU */
 		if ( mtu > NCM_MAX_NTB_INPUT_SIZE )
 			continue;
+		if ( mtu > bus->mtu )
+			continue;
 		count = ( NCM_IN_MIN_SIZE / mtu );
 		if ( count < NCM_IN_MIN_COUNT )
 			count = NCM_IN_MIN_COUNT;