4 files changed, 22 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)
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 9384b92dfc65..97ffdc1d3442 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -184,6 +184,7 @@ extern void	queue_ch_frame(struct mISDNchannel *, u_int,
 extern int      dchannel_senddata(struct dchannel *, struct sk_buff *);
 extern int      bchannel_senddata(struct bchannel *, struct sk_buff *);
 extern void     recv_Dchannel(struct dchannel *);
+extern void     recv_Echannel(struct dchannel *, struct dchannel *);
 extern void     recv_Bchannel(struct bchannel *);
 extern void     recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
 extern void     recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index a59febb6143a..f75d596c5316 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -80,6 +80,7 @@
 #define PH_DEACTIVATE_IND       0x0202
 #define PH_DEACTIVATE_CNF       0x4202
 #define PH_DATA_IND             0x2002
+#define PH_DATA_E_IND           0x3002
 #define MPH_ACTIVATE_IND        0x0502
 #define MPH_DEACTIVATE_IND      0x0602
 #define MPH_INFORMATION_IND     0x0702