lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix namespace issue with Hisax

Browse Source 
you can pull this  git://git./linux/kernel/git/kkeil/ISDN-2.6 master

rename release_tei() to TEIrelease() because release_tei() was
already exported bei the old HiSax driver.

Signed-off-by: Karsten Keil <kkeil@suse.de>
This commit is contained in:
Karsten Keil
2008-07-27 18:32:50 +02:00
parent 8be1a6d6c7
commit c5b61d59a6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2030,7 +2030,7 @@ release_l2(struct layer2 *l2)
skb_queue_purge(&l2->down_queue); skb_queue_purge(&l2->down_queue);
ReleaseWin(l2); ReleaseWin(l2);
if (test_bit(FLG_LAPD, &l2->flag)) { if (test_bit(FLG_LAPD, &l2->flag)) {
release_tei(l2); TEIrelease(l2);
if (l2->ch.st) if (l2->ch.st)
l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D,
CLOSE_CHANNEL, NULL); CLOSE_CHANNEL, NULL);

2
drivers/isdn/mISDN/layer2.h
View File

@@ -96,7 +96,7 @@ extern int tei_l2(struct layer2 *, u_int, u_long arg);
/* from tei.c */ /* from tei.c */
extern int l2_tei(struct layer2 *, u_int, u_long arg); extern int l2_tei(struct layer2 *, u_int, u_long arg);
extern void release_tei(struct layer2 *); extern void TEIrelease(struct layer2 *);
extern int TEIInit(u_int *); extern int TEIInit(u_int *);
extern void TEIFree(void); extern void TEIFree(void);

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

@@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg)
} }
void void
release_tei(struct layer2 *l2) TEIrelease(struct layer2 *l2)
{ {
struct teimgr *tm = l2->tm; struct teimgr *tm = l2->tm;
u_long flags; u_long flags;