openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Bachem 2008-09-03 15:17:45 +02:00 committed by Karsten Keil
parent a9b61830cd
commit 1f28fa19d3
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/isdn/mISDN/hwchannel.c
View File

@ -165,6 +165,25 @@ recv_Dchannel(struct dchannel *dch)
} }
EXPORT_SYMBOL(recv_Dchannel); 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 void
recv_Bchannel(struct bchannel *bch) recv_Bchannel(struct bchannel *bch)
{ {

2
drivers/isdn/mISDN/stack.c
View File

@ -453,7 +453,7 @@ connect_layer1(struct mISDNdevice *dev, struct mISDNchannel *ch,
ch->peer = &dev->D.st->own; ch->peer = &dev->D.st->own;
ch->st = dev->D.st; ch->st = dev->D.st;
rq.protocol = protocol; rq.protocol = protocol;
rq.adr.channel = 0; rq.adr.channel = adr->channel;
err = dev->D.ctrl(&dev->D, OPEN_CHANNEL, &rq); err = dev->D.ctrl(&dev->D, OPEN_CHANNEL, &rq);
printk(KERN_DEBUG "%s: ret 1 %d\n", __func__, err); printk(KERN_DEBUG "%s: ret 1 %d\n", __func__, err);
if (err) if (err)

1
include/linux/mISDNhw.h
View File

@ -184,6 +184,7 @@ extern void queue_ch_frame(struct mISDNchannel *, u_int,
extern int dchannel_senddata(struct dchannel *, struct sk_buff *); extern int dchannel_senddata(struct dchannel *, struct sk_buff *);
extern int bchannel_senddata(struct bchannel *, struct sk_buff *); extern int bchannel_senddata(struct bchannel *, struct sk_buff *);
extern void recv_Dchannel(struct dchannel *); extern void recv_Dchannel(struct dchannel *);
extern void recv_Echannel(struct dchannel *, struct dchannel *);
extern void recv_Bchannel(struct bchannel *); extern void recv_Bchannel(struct bchannel *);
extern void recv_Dchannel_skb(struct dchannel *, struct sk_buff *); extern void recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
extern void recv_Bchannel_skb(struct bchannel *, struct sk_buff *); extern void recv_Bchannel_skb(struct bchannel *, struct sk_buff *);

1
include/linux/mISDNif.h
View File

@ -80,6 +80,7 @@
#define PH_DEACTIVATE_IND 0x0202 #define PH_DEACTIVATE_IND 0x0202
#define PH_DEACTIVATE_CNF 0x4202 #define PH_DEACTIVATE_CNF 0x4202
#define PH_DATA_IND 0x2002 #define PH_DATA_IND 0x2002
#define PH_DATA_E_IND 0x3002
#define MPH_ACTIVATE_IND 0x0502 #define MPH_ACTIVATE_IND 0x0502
#define MPH_DEACTIVATE_IND 0x0602 #define MPH_DEACTIVATE_IND 0x0602
#define MPH_INFORMATION_IND 0x0702 #define MPH_INFORMATION_IND 0x0702