mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6: Fix namespace issue with Hisax
This commit is contained in:
commit
f631a78445
@ -2030,7 +2030,7 @@ release_l2(struct layer2 *l2)
|
||||
skb_queue_purge(&l2->down_queue);
|
||||
ReleaseWin(l2);
|
||||
if (test_bit(FLG_LAPD, &l2->flag)) {
|
||||
release_tei(l2);
|
||||
TEIrelease(l2);
|
||||
if (l2->ch.st)
|
||||
l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D,
|
||||
CLOSE_CHANNEL, NULL);
|
||||
|
@ -96,7 +96,7 @@ extern int tei_l2(struct layer2 *, u_int, u_long arg);
|
||||
|
||||
/* from tei.c */
|
||||
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 void TEIFree(void);
|
||||
|
||||
|
@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg)
|
||||
}
|
||||
|
||||
void
|
||||
release_tei(struct layer2 *l2)
|
||||
TEIrelease(struct layer2 *l2)
|
||||
{
|
||||
struct teimgr *tm = l2->tm;
|
||||
u_long flags;
|
||||
|
Loading…
Reference in New Issue
Block a user