Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f28fa19 authored by Martin Bachem's avatar Martin Bachem Committed by Karsten Keil
Browse files

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: default avatarMartin Bachem <m.bachem@gmx.de>
Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
parent a9b61830

drivers/isdn/mISDN/hwchannel.c

+19 −0
Original line number Diff line number Diff line
@@ -165,6 +165,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)

{

drivers/isdn/mISDN/stack.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/mISDNhw.h

+1 −0
Original line number Diff line number Diff line
@@ -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 *);

include/linux/mISDNif.h

+1 −0
Original line number Diff line number Diff line
@@ -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