Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184242
b: refs/heads/master
c: 68d7347
h: refs/heads/master
v: v3
  • Loading branch information
Jan Kiszka authored and David S. Miller committed Feb 17, 2010
1 parent 19d3b53 commit 7660806
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 42792713f7f2664cf07501e1244d6da33a73ffc1
refs/heads/master: 68d7347b280b4c1f8253c0676a520fb754f213c7
10 changes: 3 additions & 7 deletions trunk/drivers/isdn/capi/capi.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ struct capiminor {
struct sk_buff *ttyskb;

struct sk_buff_head inqueue;
int inbytes;
struct sk_buff_head outqueue;
int outbytes;

Expand Down Expand Up @@ -520,15 +519,12 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
static void handle_minor_recv(struct capiminor *mp)
{
struct sk_buff *skb;
while ((skb = skb_dequeue(&mp->inqueue)) != NULL) {
unsigned int len = skb->len;
mp->inbytes -= len;

while ((skb = skb_dequeue(&mp->inqueue)) != NULL)
if (handle_recv_skb(mp, skb) < 0) {
skb_queue_head(&mp->inqueue, skb);
mp->inbytes += len;
return;
}
}
}

static int handle_minor_send(struct capiminor *mp)
Expand Down Expand Up @@ -659,7 +655,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
datahandle, skb->len-CAPIMSG_LEN(skb->data));
#endif
skb_queue_tail(&mp->inqueue, skb);
mp->inbytes += skb->len;

handle_minor_recv(mp);

} else if (CAPIMSG_SUBCOMMAND(skb->data) == CAPI_CONF) {
Expand Down

0 comments on commit 7660806

Please sign in to comment.