From: Karsten Keil <keil@b1-systems.de>
To: linux-kernel@vger.kernel.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
i4ldeveloper@listserv.isdn4linux.de
Subject: [PATCH 14/19] Add "sapi" information to debug messages
Date: Tue, 19 May 2009 15:58:32 +0200 [thread overview]
Message-ID: <44cf481ddf924151c192431e10972d49aa74e48d.1242739648.git.kkeil@pingi.linux-pingi.de> (raw)
In-Reply-To: <cover.1242739648.git.kkeil@pingi.linux-pingi.de>
From: Andreas Eversberg <andreas@eversberg.eu>
Using sapi values other than 0 work now.
The "OpenBSC" project does not require special kernel patch anymore.
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
---
drivers/isdn/mISDN/layer2.c | 24 +++++++++++-------------
drivers/isdn/mISDN/tei.c | 11 +++++++++--
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 0628ef6..9efee8e 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -99,7 +99,7 @@ l2m_debug(struct FsmInst *fi, char *fmt, ...)
if (!(*debug & DEBUG_L2_FSM))
return;
va_start(va, fmt);
- printk(KERN_DEBUG "l2 (tei %d): ", l2->tei);
+ printk(KERN_DEBUG "l2 (sapi %d tei %d): ", l2->sapi, l2->tei);
vprintk(fmt, va);
printk("\n");
va_end(va);
@@ -1859,20 +1859,18 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
psapi >>= 2;
ptei >>= 1;
if (psapi != l2->sapi) {
- /* not our bussiness
- * printk(KERN_DEBUG "%s: sapi %d/%d sapi mismatch\n",
- * __func__,
- * psapi, l2->sapi);
- */
+ /* not our bussiness */
+ if (*debug & DEBUG_L2)
+ printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
+ __func__, psapi, l2->sapi);
dev_kfree_skb(skb);
return 0;
}
if ((ptei != l2->tei) && (ptei != GROUP_TEI)) {
- /* not our bussiness
- * printk(KERN_DEBUG "%s: tei %d/%d sapi %d mismatch\n",
- * __func__,
- * ptei, l2->tei, psapi);
- */
+ /* not our bussiness */
+ if (*debug & DEBUG_L2)
+ printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
+ __func__, ptei, l2->tei);
dev_kfree_skb(skb);
return 0;
}
@@ -1927,8 +1925,8 @@ l2_send(struct mISDNchannel *ch, struct sk_buff *skb)
int ret = -EINVAL;
if (*debug & DEBUG_L2_RECV)
- printk(KERN_DEBUG "%s: prim(%x) id(%x) tei(%d)\n",
- __func__, hh->prim, hh->id, l2->tei);
+ printk(KERN_DEBUG "%s: prim(%x) id(%x) sapi(%d) tei(%d)\n",
+ __func__, hh->prim, hh->id, l2->sapi, l2->tei);
switch (hh->prim) {
case PH_DATA_IND:
ret = ph_data_indication(l2, hh, skb);
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 9e88135..4ebba5c 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -227,7 +227,7 @@ tei_debug(struct FsmInst *fi, char *fmt, ...)
if (!(*debug & DEBUG_L2_TEIFSM))
return;
va_start(va, fmt);
- printk(KERN_DEBUG "tei(%d): ", tm->l2->tei);
+ printk(KERN_DEBUG "sapi(%d) tei(%d): ", tm->l2->sapi, tm->l2->tei);
vprintk(fmt, va);
printk("\n");
va_end(va);
@@ -1188,9 +1188,16 @@ check_data(struct manager *mgr, struct sk_buff *skb)
if ((skb->data[2] & ~0x10) != SABME)
return -ENOTCONN;
/* We got a SABME for a fixed TEI */
+ if (*debug & DEBUG_L2_CTRL)
+ printk(KERN_DEBUG "%s: SABME sapi(%d) tei(%d)\n",
+ __func__, sapi, tei);
l2 = create_new_tei(mgr, tei, sapi);
- if (!l2)
+ if (!l2) {
+ if (*debug & DEBUG_L2_CTRL)
+ printk(KERN_DEBUG "%s: failed to create new tei\n",
+ __func__);
return -ENOMEM;
+ }
ret = l2->ch.send(&l2->ch, skb);
return ret;
}
--
1.6.0.2
next prev parent reply other threads:[~2009-05-19 17:13 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-19 13:27 [PATCH 00/19] mISDN update for linux-next Karsten Keil
2009-05-19 13:58 ` [PATCH 01/19] Add XHFC support for embedded Speech-Design board to hfcmulti Karsten Keil
2009-05-19 19:11 ` David Miller
2009-05-20 3:13 ` Marcel Holtmann
2009-05-20 9:12 ` Karsten Keil
2009-05-20 19:38 ` David Miller
2009-05-20 7:56 ` Andi Kleen
2009-05-20 9:19 ` Karsten Keil
2009-05-20 11:38 ` Andi Kleen
2009-05-20 12:18 ` Karsten Keil
2009-05-20 16:59 ` Karsten Keil
2009-05-19 13:58 ` [PATCH 02/19] Fix bug in XHFC registering Karsten Keil
2009-05-19 13:58 ` [PATCH 03/19] Add PCI ID for Junghanns 8S card Karsten Keil
2009-05-19 13:58 ` [PATCH 04/19] Add watchdog functionality to hfcmulti driver Karsten Keil
2009-05-19 13:58 ` [PATCH 06/19] Fix hfcmulti's PCI IRQ bug during init Karsten Keil
2009-05-19 13:58 ` [PATCH 05/19] DSP now uses ring buffer for echo canceler Karsten Keil
2009-05-19 13:58 ` [PATCH 07/19] Echo canceler now gets delay information from hardware Karsten Keil
2009-05-19 13:58 ` [PATCH 08/19] Fixed missing spin lock on pipeline process Karsten Keil
2009-05-19 13:58 ` [PATCH 09/19] Reduce stack size in dsp_cmx_send() Karsten Keil
2009-05-19 13:58 ` [PATCH 10/19] Added layer-1-hold feature Karsten Keil
2009-05-19 13:58 ` [PATCH 11/19] Fix DTMF locking bug issue Karsten Keil
2009-05-19 13:58 ` [PATCH 12/19] Hardware acceleration is now possible in conjunction with audio recording Karsten Keil
2009-05-19 13:58 ` [PATCH 13/19] Fix TEI and SAPI handling Karsten Keil
2009-05-19 13:58 ` Karsten Keil [this message]
2009-05-19 13:58 ` [PATCH 15/19] Added PCI ID for new Junghanns.net Single E1 cards Karsten Keil
2009-05-19 13:58 ` [PATCH 16/19] Add allocation of recvbuf[1500] at run time to reduce stack size Karsten Keil
2009-05-19 13:58 ` [PATCH 17/19] Fix skb leak in error cases Karsten Keil
2009-05-19 13:58 ` [PATCH 18/19] Cleanup debug messages Karsten Keil
2009-05-19 13:58 ` [PATCH 19/19] isdn: get_free_devid() failure ignored Karsten Keil
2009-05-19 22:22 ` [PATCH 00/19] mISDN update for linux-next Stephen Rothwell
2009-05-20 1:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44cf481ddf924151c192431e10972d49aa74e48d.1242739648.git.kkeil@pingi.linux-pingi.de \
--to=keil@b1-systems.de \
--cc=i4ldeveloper@listserv.isdn4linux.de \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®