git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
l3dss1.c
diff --git
a/drivers/isdn/hisax/l3dss1.c
b/drivers/isdn/hisax/l3dss1.c
index
092634c
..
99feae8
100644
(file)
--- a/
drivers/isdn/hisax/l3dss1.c
+++ b/
drivers/isdn/hisax/l3dss1.c
@@
-12,7
+12,7
@@
* of the GNU General Public License, incorporated herein by reference.
*
* For changes and modifications please read
* of the GNU General Public License, incorporated herein by reference.
*
* For changes and modifications please read
- *
../../../
Documentation/isdn/HiSax.cert
+ * Documentation/isdn/HiSax.cert
*
* Thanks to Jan den Ouden
* Fritz Elfert
*
* Thanks to Jan den Ouden
* Fritz Elfert
@@
-23,10
+23,9
@@
#include "isdnl3.h"
#include "l3dss1.h"
#include <linux/ctype.h>
#include "isdnl3.h"
#include "l3dss1.h"
#include <linux/ctype.h>
-#include <linux/config.h>
extern char *HiSax_getrev(const char *revision);
extern char *HiSax_getrev(const char *revision);
-const char *dss1_revision = "$Revision: 2.32.2.3 $";
+
static
const char *dss1_revision = "$Revision: 2.32.2.3 $";
#define EXT_BEARER_CAPS 1
#define EXT_BEARER_CAPS 1
@@
-353,7
+352,7
@@
l3dss1_parse_facility(struct PStack *st, struct l3_process *pc,
{ l3dss1_dummy_invoke(st, cr, id, ident, p, nlen);
return;
}
{ l3dss1_dummy_invoke(st, cr, id, ident, p, nlen);
return;
}
-#if HISAX_DE_AOC
+#if
def
HISAX_DE_AOC
{
#define FOO1(s,a,b) \
{
#define FOO1(s,a,b) \
@@
-977,7
+976,7
@@
l3dss1_release_cmpl(struct l3_process *pc, u_char pr, void *arg)
dss1_release_l3_process(pc);
}
dss1_release_l3_process(pc);
}
-#if EXT_BEARER_CAPS
+#if
def
EXT_BEARER_CAPS
static u_char *
EncodeASyncParams(u_char * p, u_char si2)
static u_char *
EncodeASyncParams(u_char * p, u_char si2)
@@
-1369,7
+1368,7
@@
l3dss1_setup_req(struct l3_process *pc, u_char pr,
*p++ = *sub++ & 0x7f;
}
}
*p++ = *sub++ & 0x7f;
}
}
-#if EXT_BEARER_CAPS
+#if
def
EXT_BEARER_CAPS
if ((pc->para.setup.si2 >= 160) && (pc->para.setup.si2 <= 175)) { // sync. Bitratenadaption, V.110/X.30
*p++ = IE_LLC;
if ((pc->para.setup.si2 >= 160) && (pc->para.setup.si2 <= 175)) { // sync. Bitratenadaption, V.110/X.30
*p++ = IE_LLC;
@@
-1609,7
+1608,7
@@
l3dss1_setup(struct l3_process *pc, u_char pr, void *arg)
case 0x08: /* Unrestricted digital information */
pc->para.setup.si1 = 7;
/* JIM, 05.11.97 I wanna set service indicator 2 */
case 0x08: /* Unrestricted digital information */
pc->para.setup.si1 = 7;
/* JIM, 05.11.97 I wanna set service indicator 2 */
-#if EXT_BEARER_CAPS
+#if
def
EXT_BEARER_CAPS
pc->para.setup.si2 = DecodeSI2(skb);
#endif
break;
pc->para.setup.si2 = DecodeSI2(skb);
#endif
break;