mISDN: Early confirm for transparent data

It is better to send a confirm for transparent data early as possible
to avoid TX underuns.

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 6c044d55536b..e4b6d8d51aae 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -1011,15 +1011,11 @@ hscx_fill_fifo(struct hscx_hw *hscx)
 static void
 hscx_xpr(struct hscx_hw *hx)
 {
-        if (hx->bch.tx_skb && hx->bch.tx_idx < hx->bch.tx_skb->len)
+        if (hx->bch.tx_skb && hx->bch.tx_idx < hx->bch.tx_skb->len) {
                 hscx_fill_fifo(hx);
-        else {
-                if (hx->bch.tx_skb) {
-                        /* send confirm, on trans, free on hdlc. */
-                        if (test_bit(FLG_TRANSPARENT, &hx->bch.Flags))
-                                confirm_Bsend(&hx->bch);
+        } else {
+                if (hx->bch.tx_skb)
                         dev_kfree_skb(hx->bch.tx_skb);
-                }
                 if (get_next_bframe(&hx->bch))
                         hscx_fill_fifo(hx);
         }
@@ -1342,22 +1338,17 @@ hscx_l2l1(struct mISDNchannel *ch, struct sk_buff *skb)
         struct hscx_hw  *hx = container_of(bch, struct hscx_hw, bch);
         int ret = -EINVAL;
         struct mISDNhead *hh = mISDN_HEAD_P(skb);
-        u32 id;
-        u_long flags;
+        unsigned long flags;
 
         switch (hh->prim) {
         case PH_DATA_REQ:
                 spin_lock_irqsave(hx->ip->hwlock, flags);
                 ret = bchannel_senddata(bch, skb);
                 if (ret > 0) { /* direct TX */
-                        id = hh->id; /* skb can be freed */
                         ret = 0;
                         hscx_fill_fifo(hx);
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
-                        if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
-                                queue_ch_frame(ch, PH_DATA_CNF, id, NULL);
-                } else
-                        spin_unlock_irqrestore(hx->ip->hwlock, flags);
+                }
+                spin_unlock_irqrestore(hx->ip->hwlock, flags);
                 return ret;
         case PH_ACTIVATE_REQ:
                 spin_lock_irqsave(hx->ip->hwlock, flags);