Commit 0579fac9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix ISDN v.110.

From: David Woodhouse <dwmw2@infradead.org>

Now that we coalesce ACKs for outgoing packets, the v.110 code needs to
look at the size it's given rather than assuming it'll get precisely one
callback for each packet sent...
parent f532bdf6
...@@ -535,6 +535,7 @@ isdn_v110_stat_callback(int idx, isdn_ctrl * c) ...@@ -535,6 +535,7 @@ isdn_v110_stat_callback(int idx, isdn_ctrl * c)
if (!(v = dev->v110[idx])) if (!(v = dev->v110[idx]))
return 0; return 0;
atomic_inc(&dev->v110use[idx]); atomic_inc(&dev->v110use[idx]);
for (i=0; i * v->framelen < c->parm.length; i++) {
if (v->skbidle > 0) { if (v->skbidle > 0) {
v->skbidle--; v->skbidle--;
ret = 1; ret = 1;
...@@ -543,6 +544,7 @@ isdn_v110_stat_callback(int idx, isdn_ctrl * c) ...@@ -543,6 +544,7 @@ isdn_v110_stat_callback(int idx, isdn_ctrl * c)
v->skbuser--; v->skbuser--;
ret = 0; ret = 0;
} }
}
for (i = v->skbuser + v->skbidle; i < 2; i++) { for (i = v->skbuser + v->skbidle; i < 2; i++) {
struct sk_buff *skb; struct sk_buff *skb;
if (v->SyncInit > 0) if (v->SyncInit > 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment