linux-kernel - [2.6 patch] release

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080727154926.GN9301@cs181140183.pp.htv.fi>
Date:	Sun, 27 Jul 2008 18:49:26 +0300
From:	Adrian Bunk <bunk@...nel.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Karsten Keil <kkeil@...e.de>
Cc:	linux-kernel@...r.kernel.org
Subject: [2.6 patch] release_tei namespace fix

This patch fixes the following build error caused by
commit 1b2b03f8e514e4f68e293846ba511a948b80243c
(Add mISDN core files):

<--  snip  -->

...
  LD      drivers/isdn/built-in.o
drivers/isdn/hisax/built-in.o: In function `release_tei':
(.text+0x21ce): multiple definition of `release_tei'
drivers/isdn/mISDN/built-in.o:(.text+0x7c39): first defined here
make[3]: *** [drivers/isdn/built-in.o] Error 1

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@...nel.org>

---

 drivers/isdn/mISDN/layer2.c |    2 +-
 drivers/isdn/mISDN/layer2.h |    2 +-
 drivers/isdn/mISDN/tei.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

bc16cf6ec9d5c2fd14043184c3babb8ebbd7ed87 
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index f5ad888..10396a5 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -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);
+		release_l2_tei(l2);
 		if (l2->ch.st)
 			l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D,
 			    CLOSE_CHANNEL, NULL);
diff --git a/drivers/isdn/mISDN/layer2.h b/drivers/isdn/mISDN/layer2.h
index de2dd02..90f6436 100644
--- a/drivers/isdn/mISDN/layer2.h
+++ b/drivers/isdn/mISDN/layer2.h
@@ -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 		release_l2_tei(struct layer2 *);
 extern int 		TEIInit(u_int *);
 extern void 		TEIFree(void);
 
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 56a76a0..9d0066f 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg)
 }
 
 void
-release_tei(struct layer2 *l2)
+release_l2_tei(struct layer2 *l2)
 {
 	struct teimgr	*tm = l2->tm;
 	u_long		flags;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/