From 6aa80bd23c91c105af294afe09e24f6547770029 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Sun, 7 Oct 2012 19:31:23 +0200 Subject: net: cdc_ncm: use device rx_max value if update failed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the device refuses our updated value, then we must be prepared to receive URBs as big as the device wants to send. Set rx_max to the device provided value on error. Signed-off-by: Bjørn Mork --- drivers/net/usb/cdc_ncm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 4cd582a4f62..6a65662aa9d 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -251,8 +251,11 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) kfree(dwNtbInMaxSize); } size_err: - if (err < 0) - pr_debug("Setting NTB Input Size failed\n"); + if (err < 0) { + /* failed, so attempt to use the device suggested size */ + ctx->rx_max = le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize); + pr_debug("Setting NTB Input Size failed, reverting to %u\n", ctx->rx_max); + } } /* verify maximum size of transmitted NTB in bytes */ -- cgit v1.2.3