From: Tilman Schmidt <tilman-ZTO5kqT2PaM@public•gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
i4ldeveloper-JX7+OpRa80SjiSfgN6Y1Ib39b6g2fGNp@public•gmane.org
Cc: Hansjoerg Lipp <hjlipp-S0/GAf8tV78@public•gmane.org>
Subject: [PATCH 04/12] gigaset: handle isoc frame errors more gracefully
Date: Sun, 6 Sep 2009 20:58:52 +0200 (CEST) [thread overview]
Message-ID: <20090906-patch-gigaset-04.tilman@imap.cc> (raw)
In-Reply-To: <20090906-patch-gigaset-00.tilman-ZTO5kqT2PaM@public.gmane.org>
Don't drop the remainder of an URB if an isochronous frame has an error.
Impact: error handling improvement
Signed-off-by: Tilman Schmidt <tilman-ZTO5kqT2PaM@public•gmane.org>
---
drivers/isdn/gigaset/bas-gigaset.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 781c404..9e7108a 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -1331,28 +1331,24 @@ static void read_iso_tasklet(unsigned long data)
rcvbuf = urb->transfer_buffer;
totleft = urb->actual_length;
for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
- if (unlikely(urb->iso_frame_desc[frame].status)) {
+ numbytes = urb->iso_frame_desc[frame].actual_length;
+ if (unlikely(urb->iso_frame_desc[frame].status))
dev_warn(cs->dev,
- "isochronous read: frame %d: %s\n",
- frame,
+ "isochronous read: frame %d[%d]: %s\n",
+ frame, numbytes,
get_usb_statmsg(
urb->iso_frame_desc[frame].status));
- break;
- }
- numbytes = urb->iso_frame_desc[frame].actual_length;
- if (unlikely(numbytes > BAS_MAXFRAME)) {
+ if (unlikely(numbytes > BAS_MAXFRAME))
dev_warn(cs->dev,
"isochronous read: frame %d: "
"numbytes (%d) > BAS_MAXFRAME\n",
frame, numbytes);
- break;
- }
if (unlikely(numbytes > totleft)) {
dev_warn(cs->dev,
"isochronous read: frame %d: "
"numbytes (%d) > totleft (%d)\n",
frame, numbytes, totleft);
- break;
+ numbytes = totleft;
}
offset = urb->iso_frame_desc[frame].offset;
if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
@@ -1361,7 +1357,7 @@ static void read_iso_tasklet(unsigned long data)
"offset (%d) + numbytes (%d) "
"> BAS_INBUFSIZE\n",
frame, offset, numbytes);
- break;
+ numbytes = BAS_INBUFSIZE - offset;
}
gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
totleft -= numbytes;
--
1.6.2.1.214.ge986c
next prev parent reply other threads:[~2009-09-06 18:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-06 18:58 [PATCH 00/12] Gigaset driver patches for 2.6.32 Tilman Schmidt
2009-09-06 18:58 ` [PATCH 06/12] gigaset: fix device ERROR response handling Tilman Schmidt
2009-09-06 18:58 ` [PATCH 01/12] gigaset: really fix chars_in_buffer Tilman Schmidt
2009-09-06 18:58 ` [PATCH 02/12] gigaset: fix reject/hangup handling Tilman Schmidt
2009-09-06 18:58 ` [PATCH 11/12] gigaset: allow building without I4L Tilman Schmidt
[not found] ` <20090906-patch-gigaset-00.tilman-ZTO5kqT2PaM@public.gmane.org>
2009-09-06 18:58 ` [PATCH 07/12] gigaset: improve error recovery Tilman Schmidt
[not found] ` <20090906-patch-gigaset-07.tilman-ZTO5kqT2PaM@public.gmane.org>
2009-09-07 8:59 ` [PATCH 07/12 v2] " Tilman Schmidt
2009-09-06 18:58 ` [PATCH 08/12] gigaset: correct debugging output selection Tilman Schmidt
2009-09-06 18:58 ` Tilman Schmidt [this message]
2009-09-06 18:58 ` [PATCH 10/12] gigaset: prepare for CAPI implementation Tilman Schmidt
2009-09-06 18:58 ` [PATCH 03/12] gigaset: linearize skb Tilman Schmidt
2009-09-06 18:58 ` [PATCH 12/12] gigaset: add Kernel CAPI interface Tilman Schmidt
2009-09-06 18:58 ` [PATCH 09/12] gigaset: add kerneldoc comments Tilman Schmidt
2009-09-06 18:58 ` [PATCH 05/12] gigaset: announce if built with debugging Tilman Schmidt
2009-09-07 1:26 ` [PATCH 00/12] Gigaset driver patches for 2.6.32 Daniel Walker
2009-09-07 9:07 ` Tilman Schmidt
2009-09-07 14:30 ` Daniel Walker
2009-09-07 9:00 ` David Miller
2009-09-07 9:11 ` Tilman Schmidt
2009-09-07 9:18 ` David Miller
2009-09-07 18:56 ` Karsten Keil
-- strict thread matches above, loose matches on Subject: below --
2009-09-18 23:57 [PATCH 00/12] Gigaset driver patches for 2.6.32 (v2) Tilman Schmidt
2009-09-18 23:57 ` [PATCH 04/12] gigaset: handle isoc frame errors more gracefully Tilman Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090906-patch-gigaset-04.tilman@imap.cc \
--to=tilman-zto5kqt2pam@public$(echo .)gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public$(echo .)gmane.org \
--cc=hjlipp-S0/GAf8tV78@public$(echo .)gmane.org \
--cc=i4ldeveloper-JX7+OpRa80SjiSfgN6Y1Ib39b6g2fGNp@public$(echo .)gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox