|
@@ -516,25 +516,24 @@ static void handle_minor_recv(struct capiminor *mp)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static int handle_minor_send(struct capiminor *mp)
|
|
|
+static void handle_minor_send(struct capiminor *mp)
|
|
|
{
|
|
|
struct tty_struct *tty;
|
|
|
struct sk_buff *skb;
|
|
|
u16 len;
|
|
|
- int count = 0;
|
|
|
u16 errcode;
|
|
|
u16 datahandle;
|
|
|
|
|
|
tty = tty_port_tty_get(&mp->port);
|
|
|
if (!tty)
|
|
|
- return 0;
|
|
|
+ return;
|
|
|
|
|
|
if (mp->ttyoutstop) {
|
|
|
#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
|
|
|
printk(KERN_DEBUG "capi: send: tty stopped\n");
|
|
|
#endif
|
|
|
tty_kref_put(tty);
|
|
|
- return 0;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
while (1) {
|
|
@@ -570,12 +569,10 @@ static int handle_minor_send(struct capiminor *mp)
|
|
|
mp->outbytes += len;
|
|
|
spin_unlock_bh(&mp->outlock);
|
|
|
|
|
|
- tty_kref_put(tty);
|
|
|
- return count;
|
|
|
+ break;
|
|
|
}
|
|
|
errcode = capi20_put_message(mp->ap, skb);
|
|
|
if (errcode == CAPI_NOERROR) {
|
|
|
- count++;
|
|
|
#ifdef _DEBUG_DATAFLOW
|
|
|
printk(KERN_DEBUG "capi: DATA_B3_REQ %u len=%u\n",
|
|
|
datahandle, len);
|
|
@@ -600,7 +597,6 @@ static int handle_minor_send(struct capiminor *mp)
|
|
|
kfree_skb(skb);
|
|
|
}
|
|
|
tty_kref_put(tty);
|
|
|
- return count;
|
|
|
}
|
|
|
|
|
|
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
|
|
@@ -677,7 +673,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
|
|
|
tty_wakeup(tty);
|
|
|
tty_kref_put(tty);
|
|
|
}
|
|
|
- (void)handle_minor_send(mp);
|
|
|
+ handle_minor_send(mp);
|
|
|
|
|
|
} else {
|
|
|
/* ups, let capi application handle it :-) */
|
|
@@ -1114,7 +1110,7 @@ static int capinc_tty_write(struct tty_struct *tty,
|
|
|
mp->outbytes += skb->len;
|
|
|
spin_unlock_bh(&mp->outlock);
|
|
|
|
|
|
- (void)handle_minor_send(mp);
|
|
|
+ handle_minor_send(mp);
|
|
|
|
|
|
return count;
|
|
|
}
|
|
@@ -1157,7 +1153,7 @@ unlock_out:
|
|
|
spin_unlock_bh(&mp->outlock);
|
|
|
|
|
|
if (invoke_send)
|
|
|
- (void)handle_minor_send(mp);
|
|
|
+ handle_minor_send(mp);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -1179,7 +1175,7 @@ static void capinc_tty_flush_chars(struct tty_struct *tty)
|
|
|
mp->outbytes += skb->len;
|
|
|
spin_unlock_bh(&mp->outlock);
|
|
|
|
|
|
- (void)handle_minor_send(mp);
|
|
|
+ handle_minor_send(mp);
|
|
|
} else
|
|
|
spin_unlock_bh(&mp->outlock);
|
|
|
|
|
@@ -1269,7 +1265,7 @@ static void capinc_tty_start(struct tty_struct *tty)
|
|
|
printk(KERN_DEBUG "capinc_tty_start\n");
|
|
|
#endif
|
|
|
mp->ttyoutstop = 0;
|
|
|
- (void)handle_minor_send(mp);
|
|
|
+ handle_minor_send(mp);
|
|
|
}
|
|
|
|
|
|
static void capinc_tty_hangup(struct tty_struct *tty)
|