From: Andrew Morton <akpm@linux-foundation.org>
To: tony@bakeyournoodle.com (Tony Breeds)
Cc: Michael Wu <flamingice@sourmilk.net>,
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>,
"John W. Linville" <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org
Subject: Re: mm snapshot broken-out-2007-11-20-01-45 Build Fail - net/wireless driver
Date: Mon, 26 Nov 2007 18:54:23 -0800 [thread overview]
Message-ID: <20071126185423.9280b263.akpm@linux-foundation.org> (raw)
In-Reply-To: <20071127023430.GA24243@bakeyournoodle.com>
On Tue, 27 Nov 2007 13:34:30 +1100 tony@bakeyournoodle.com (Tony Breeds) wrote:
> On Mon, Nov 26, 2007 at 09:20:08PM -0500, Michael Wu wrote:
>
> > I would rather have a patch to temporarily not allow them to be built into the
> > kernel. (or only allow one at a time to be built as a module) There's no
> > issues when these drivers are compiled as modules.
>
> Perhaps as below?
>
> > It's mostly the rtl8225 radio tuning code that's similar. They're not exactly
> > the same though, so it'll be a bit messy to merge the usb rtl8225 radio
> > tuning and pci rtl8225 radio tuning code. However, I do think it'll be better
> > overall so the merger of that code is planned.
>
> okay, the diff between the 2 drivers doesn't look too bad really, but as
> you say it won't be trivial to merge them.
>
> From: Tony Breeds <tony@bakeyournoodle.com>
>
> Temporarily ensure that Realtek 8185 and 8187 can only be built as modules.
>
> These two drivers share a number of common (global) functions. While a better
> long term solution is developed lets ensure that they are never built into
> the kernel, to avoid symbol conflicts.
>
> Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
>
> ---
>
> drivers/net/wireless/Kconfig | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
> index 82e5de7..023dd9d 100644
> --- a/drivers/net/wireless/Kconfig
> +++ b/drivers/net/wireless/Kconfig
> @@ -555,11 +555,13 @@ config USB_ZD1201
> config RTL8180
> tristate "Realtek 8185 PCI support"
> depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
> + depends on m
> select EEPROM_93CX6
>
> config RTL8187
> tristate "Realtek 8187 USB support"
> depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
> + depends on m
> select EEPROM_93CX6
> ---help---
> This is a driver for RTL8187 based cards.
>
<head spins>
Why not just rename one of them?
diff -puN drivers/net/wireless/rtl8187_dev.c~a drivers/net/wireless/rtl8187_dev.c
--- a/drivers/net/wireless/rtl8187_dev.c~a
+++ a/drivers/net/wireless/rtl8187_dev.c
@@ -764,7 +764,7 @@ static int __devinit rtl8187_probe(struc
if (rtl8225_read(dev, 8) != 0x588 || rtl8225_read(dev, 9) != 0x700)
priv->rf_init = rtl8225_rf_init;
else
- priv->rf_init = rtl8225z2_rf_init;
+ priv->rf_init = rtl8187_rf_init;
rtl8225_write(dev, 0, 0x0B7);
diff -puN drivers/net/wireless/rtl8187_rtl8225.c~a drivers/net/wireless/rtl8187_rtl8225.c
--- a/drivers/net/wireless/rtl8187_rtl8225.c~a
+++ a/drivers/net/wireless/rtl8187_rtl8225.c
@@ -567,7 +567,7 @@ static const u8 rtl8225z2_gain_bg[] = {
0x63, 0x15, 0xc5 /* -66dBm */
};
-void rtl8225z2_rf_init(struct ieee80211_hw *dev)
+void rtl8187_rf_init(struct ieee80211_hw *dev)
{
struct rtl8187_priv *priv = dev->priv;
int i;
diff -puN drivers/net/wireless/rtl8187_rtl8225.h~a drivers/net/wireless/rtl8187_rtl8225.h
--- a/drivers/net/wireless/rtl8187_rtl8225.h~a
+++ a/drivers/net/wireless/rtl8187_rtl8225.h
@@ -24,7 +24,7 @@ void rtl8225_write(struct ieee80211_hw *
u16 rtl8225_read(struct ieee80211_hw *, u8 addr);
void rtl8225_rf_init(struct ieee80211_hw *);
-void rtl8225z2_rf_init(struct ieee80211_hw *);
+void rtl8187_rf_init(struct ieee80211_hw *);
void rtl8225_rf_stop(struct ieee80211_hw *);
void rtl8225_rf_set_channel(struct ieee80211_hw *, int);
_
next prev parent reply other threads:[~2007-11-27 2:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-20 9:45 mm snapshot broken-out-2007-11-20-01-45.tar.gz uploaded akpm
2007-11-20 11:30 ` Kamalesh Babulal
2007-11-20 13:07 ` Thomas Gleixner
2007-11-20 14:21 ` Thomas Gleixner
2007-11-20 14:34 ` Kamalesh Babulal
2007-11-20 13:23 ` mm snapshot broken-out-2007-11-20-01-45 Build Fail - net/wireless driver Kamalesh Babulal
2007-11-27 0:59 ` Tony Breeds
2007-11-27 2:20 ` Michael Wu
2007-11-27 2:34 ` Tony Breeds
2007-11-27 2:54 ` Andrew Morton [this message]
2007-11-27 4:31 ` Michael Wu
2007-11-27 4:37 ` Andrew Morton
2007-11-27 4:52 ` Michael Wu
2007-11-27 4:57 ` Andrew Morton
2007-11-27 4:37 ` Michael Wu
2007-11-27 4:55 ` Andrew Morton
2007-11-27 5:06 ` Michael Wu
2007-11-27 5:12 ` Andrew Morton
2007-11-20 13:29 ` mm snapshot broken-out-2007-11-20-01-45.tar.gz uploaded Kamalesh Babulal
2007-11-20 14:02 ` [PATCH] mm snapshot broken-out-2007-11-20-01-45 build failer tumbler/snapper Kamalesh Babulal
2007-11-20 13:48 ` Takashi Iwai
2007-11-20 13:48 ` Takashi Iwai
2007-11-20 14:22 ` mm snapshot broken-out-2007-11-20-01-45 Build Failure mach_apic.h Kamalesh Babulal
2007-11-20 20:31 ` Andrew Morton
[not found] ` <200711200953.lAK9qxjO030444-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
2007-11-20 14:46 ` [NFS] mm snapshot broken-out-2007-11-20-01-45.tar.gz -- powerpc panic Andy Whitcroft
2007-11-20 14:46 ` Andy Whitcroft
[not found] ` <20071120144659.GC12066-26w3C0LaAnFg9hUCZPvPmw@public.gmane.org>
2007-11-20 20:35 ` [NFS] " Andrew Morton
2007-11-20 20:35 ` Andrew Morton
2007-11-20 22:23 ` [NFS] " Eric W. Biederman
2007-11-20 22:23 ` Eric W. Biederman
2007-11-20 14:48 ` [PATCH] mm snapshot broken-out-2007-11-20-01-45 Build Failure arch/x86/kernel/pci-gart_64.c Kamalesh Babulal
2007-11-20 15:18 ` mm snapshot broken-out-2007-11-20-01-45.tar.gz uploaded Kamalesh Babulal
2007-11-20 20:50 ` Andrew Morton
2007-11-21 1:32 ` David Howells
2007-11-21 2:40 ` Andrew Morton
2007-11-21 12:49 ` David Howells
2007-11-21 16:15 ` David Howells
2007-11-20 20:34 ` Kamalesh Babulal
2007-11-20 20:48 ` Paul Moore
2007-11-20 21:31 ` Paul Moore
2007-11-20 21:18 ` mm snapshot broken-out-2007-11-20-01-45 Build Failure - macro CONFIG_THREAD_ORDER not defined Kamalesh Babulal
2007-11-20 21:41 ` Andrew Morton
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=20071126185423.9280b263.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=flamingice@sourmilk.net \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=tony@bakeyournoodle.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.