mISDN: Add E-Channel logging features

New prim PH_DATA_E_IND.

 - all E-ch frames are indicated by recv_Echannel(), which pushes E-Channel
   frames into dch's rqueue
 - if dchannel is opened with channel nr 0, no E-Channel logging
   is requested
 - if dchannel is opened with channel nr 1, E-Channel logging
   is requested. if layer1 does not support that, -EINVAL
   in return is appropriate

Signed-off-by: Martin Bachem <m.bachem@gmx.de>
Signed-off-by: Karsten Keil <kkeil@suse.de>

2 files changed, 20 insertions, 1 deletions

diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 535ceacc05b9..ab1168a110ae 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -166,6 +166,25 @@ recv_Dchannel(struct dchannel *dch)
 EXPORT_SYMBOL(recv_Dchannel);
 
 void
+recv_Echannel(struct dchannel *ech, struct dchannel *dch)
+{
+        struct mISDNhead *hh;
+
+        if (ech->rx_skb->len < 2) { /* at least 2 for sapi / tei */
+                dev_kfree_skb(ech->rx_skb);
+                ech->rx_skb = NULL;
+                return;
+        }
+        hh = mISDN_HEAD_P(ech->rx_skb);
+        hh->prim = PH_DATA_E_IND;
+        hh->id = get_sapi_tei(ech->rx_skb->data);
+        skb_queue_tail(&dch->rqueue, ech->rx_skb);
+        ech->rx_skb = NULL;
+        schedule_event(dch, FLG_RECVQUEUE);
+}
+EXPORT_SYMBOL(recv_Echannel);
+
+void
 recv_Bchannel(struct bchannel *bch)
 {
         struct mISDNhead *hh;
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index 9b9fab47cb2b..8cff570bb8df 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -453,7 +453,7 @@ connect_layer1(struct mISDNdevice *dev, struct mISDNchannel *ch,
                 ch->peer = &dev->D.st->own;
                 ch->st = dev->D.st;
                 rq.protocol = protocol;
-                rq.adr.channel = 0;
+                rq.adr.channel = adr->channel;
                 err = dev->D.ctrl(&dev->D, OPEN_CHANNEL, &rq);
                 printk(KERN_DEBUG "%s: ret 1 %d\n", __func__, err);
                 if (err)