[PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG

linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL
@ 2011-10-13 14:25 Hauke Mehrtens
  2011-10-13 14:28 ` Johannes Berg
  2011-11-09 20:27 ` [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile John W. Linville
  0 siblings, 2 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2011-10-13 14:25 UTC (permalink / raw)
  To: arend, linville; +Cc: linux-wireless, Hauke Mehrtens

There is no config option named CONFIG_BRCMUMAC this should be
CONFIG_BRCMUTIL as this is missing here.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/net/wireless/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 0a304b0..812a050 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -59,5 +59,5 @@ obj-$(CONFIG_IWM)	+= iwmc3200wifi/
 
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
 obj-$(CONFIG_BRCMFMAC) += brcm80211/
-obj-$(CONFIG_BRCMUMAC) += brcm80211/
+obj-$(CONFIG_BRCMUTIL) += brcm80211/
 obj-$(CONFIG_BRCMSMAC) += brcm80211/
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL
  2011-10-13 14:25 [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL Hauke Mehrtens
@ 2011-10-13 14:28 ` Johannes Berg
  2011-10-13 15:12   ` Arend van Spriel
  2011-11-09 20:27 ` [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile John W. Linville
  1 sibling, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2011-10-13 14:28 UTC (permalink / raw)
  To: Hauke Mehrtens; +Cc: arend, linville, linux-wireless

On Thu, 2011-10-13 at 16:25 +0200, Hauke Mehrtens wrote:
> There is no config option named CONFIG_BRCMUMAC this should be
> CONFIG_BRCMUTIL as this is missing here.
> 
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
>  drivers/net/wireless/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
> index 0a304b0..812a050 100644
> --- a/drivers/net/wireless/Makefile
> +++ b/drivers/net/wireless/Makefile
> @@ -59,5 +59,5 @@ obj-$(CONFIG_IWM)	+= iwmc3200wifi/
>  
>  obj-$(CONFIG_MWIFIEX)	+= mwifiex/
>  obj-$(CONFIG_BRCMFMAC) += brcm80211/
> -obj-$(CONFIG_BRCMUMAC) += brcm80211/
> +obj-$(CONFIG_BRCMUTIL) += brcm80211/
>  obj-$(CONFIG_BRCMSMAC) += brcm80211/

Shouldn't it just go away since BRCMUTIL depends on SMAC||FMAC and is
otherwise unreachable?

johannes


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL
  2011-10-13 14:28 ` Johannes Berg
@ 2011-10-13 15:12   ` Arend van Spriel
  0 siblings, 0 replies; 5+ messages in thread
From: Arend van Spriel @ 2011-10-13 15:12 UTC (permalink / raw)
  To: Johannes Berg
  Cc: Hauke Mehrtens, linville@tuxdriver.com,
	linux-wireless@vger.kernel.org

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

On 10/13/2011 04:28 PM, Johannes Berg wrote:
> On Thu, 2011-10-13 at 16:25 +0200, Hauke Mehrtens wrote:
>> There is no config option named CONFIG_BRCMUMAC this should be
>> CONFIG_BRCMUTIL as this is missing here.
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>>  drivers/net/wireless/Makefile |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
>> index 0a304b0..812a050 100644
>> --- a/drivers/net/wireless/Makefile
>> +++ b/drivers/net/wireless/Makefile
>> @@ -59,5 +59,5 @@ obj-$(CONFIG_IWM)	+= iwmc3200wifi/
>>  
>>  obj-$(CONFIG_MWIFIEX)	+= mwifiex/
>>  obj-$(CONFIG_BRCMFMAC) += brcm80211/
>> -obj-$(CONFIG_BRCMUMAC) += brcm80211/
>> +obj-$(CONFIG_BRCMUTIL) += brcm80211/
>>  obj-$(CONFIG_BRCMSMAC) += brcm80211/
> 
> Shouldn't it just go away since BRCMUTIL depends on SMAC||FMAC and is
> otherwise unreachable?
> 
> johannes
> 
> 

Henry provided the script for preparing the mainline patch. Indeed there
is no BRCMUMAC item so that was clearly a mistake. Also Johannes
statement is a valid one. BRCMUTIL always comes with either BRCMSMAC or
BRCMFMAC so include brcm80211/ on BRCMSMAC or BRCMFMAC is sufficient.
The Makefile in brcm80211 assures brcmutil module is built.

Gr. AvS

[-- Attachment #2: 0xB5E1A116.asc --]
[-- Type: application/pgp-keys, Size: 3113 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile
  2011-10-13 14:25 [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL Hauke Mehrtens
  2011-10-13 14:28 ` Johannes Berg
@ 2011-11-09 20:27 ` John W. Linville
  2011-11-10  8:54   ` Arend van Spriel
  1 sibling, 1 reply; 5+ messages in thread
From: John W. Linville @ 2011-11-09 20:27 UTC (permalink / raw)
  To: linux-wireless; +Cc: Arend van Spriel, Hauke Mehrtens, John W. Linville

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/net/wireless/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 0a304b0..c1c0678 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -58,6 +58,6 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/
 obj-$(CONFIG_IWM)	+= iwmc3200wifi/
 
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
-obj-$(CONFIG_BRCMFMAC) += brcm80211/
-obj-$(CONFIG_BRCMUMAC) += brcm80211/
-obj-$(CONFIG_BRCMSMAC) += brcm80211/
+
+obj-$(CONFIG_BRCMFMAC)	+= brcm80211/
+obj-$(CONFIG_BRCMSMAC)	+= brcm80211/
-- 
1.7.4.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile
  2011-11-09 20:27 ` [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile John W. Linville
@ 2011-11-10  8:54   ` Arend van Spriel
  0 siblings, 0 replies; 5+ messages in thread
From: Arend van Spriel @ 2011-11-10  8:54 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens

On 11/09/2011 09:27 PM, John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  drivers/net/wireless/Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 

Thanks, John

You may add my acknowledgement (leave it up to you ;-) ).

Acked-by: Arend van Spriel <arend@broadcom.com>

Gr. AvS


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-11-10  8:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-13 14:25 [PATCH] brcm80211: rename CONFIG_BRCMUMAC to CONFIG_BRCMUTIL Hauke Mehrtens
2011-10-13 14:28 ` Johannes Berg
2011-10-13 15:12   ` Arend van Spriel
2011-11-09 20:27 ` [PATCH] wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile John W. Linville
2011-11-10  8:54   ` Arend van Spriel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).