[PATCH 1/1] iwlwifi: Fix built-in compilation of iwlcore

[PATCH 1/1] iwlwifi: Fix built-in compilation of iwlcore

[Tomas Winkler]

This patch fixes problem in Makefile that prevented
built-in compilation of iwlcore

Commit that caused this problem: eadd3c4b

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Yi Zhu <yi.zhu@intel.com>
---
 drivers/net/wireless/iwlwifi/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index e83dd68..e2c05f5 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_IWLCORE)	:= iwlcore.o
+obj-$(CONFIG_IWLCORE)	+= iwlcore.o
 iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
-- 
1.5.4.1

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH 1/1] iwlwifi: Fix built-in compilation of iwlcore

[David Miller]

From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 23 Apr 2008 13:38:41 +0300

[ John Linville's email was corrupted in the CC: line, fixed. ]

> This patch fixes problem in Makefile that prevented
> built-in compilation of iwlcore
> 
> Commit that caused this problem: eadd3c4b

Please provide the header line tead of commits, don't just reference
them as SHA IDs, because SHA IDs change when patches are ported and
applied to other GIT trees.

When applying this patch I fixed it up to:

--------------------
Commit that caused this problem: eadd3c4b ("iwlwifi: make Makefile
more concise")
--------------------

Please do this in the future, thanks.

> diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
> index e83dd68..e2c05f5 100644
> --- a/drivers/net/wireless/iwlwifi/Makefile
> +++ b/drivers/net/wireless/iwlwifi/Makefile
> @@ -1,4 +1,4 @@
> -obj-$(CONFIG_IWLCORE)	:= iwlcore.o
> +obj-$(CONFIG_IWLCORE)	+= iwlcore.o
>  iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

I had to apply this patch by hand because "iwl-power.o" is not
present in the iwlcore-objs line in the current tree.

Does it exist in John's wireless tree or something like that?  This
new iwl-power.o object looks like it would be new code and a new
feature, which we wouldn't be able to add into the tree at this time
as all networking new features have gone into the merge window
already.

Please do not mix bug fixes with new code changes like that.

To expedite getting this bug fix applied, I've added this fix
by hand and will push it to Linus tonight.

Thank you.

Re: [PATCH 1/1] iwlwifi: Fix built-in compilation of iwlcore

[John W. Linville]

On Wed, Apr 23, 2008 at 03:49:43AM -0700, David Miller wrote:
> From: Tomas Winkler <tomas.winkler@intel.com>

> > --- a/drivers/net/wireless/iwlwifi/Makefile
> > +++ b/drivers/net/wireless/iwlwifi/Makefile
> > @@ -1,4 +1,4 @@
> > -obj-$(CONFIG_IWLCORE)	:= iwlcore.o
> > +obj-$(CONFIG_IWLCORE)	+= iwlcore.o
> >  iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
> 
> I had to apply this patch by hand because "iwl-power.o" is not
> present in the iwlcore-objs line in the current tree.
> 
> Does it exist in John's wireless tree or something like that?  This
> new iwl-power.o object looks like it would be new code and a new
> feature, which we wouldn't be able to add into the tree at this time
> as all networking new features have gone into the merge window
> already.

FWIW, I don't have an iwl-power.c either.  Please be careful to
send patches against the actual upstream tree rather than a working
tree. :-)

> To expedite getting this bug fix applied, I've added this fix
> by hand and will push it to Linus tonight.

Thanks, Dave!

John
-- 
John W. Linville
linville@tuxdriver.com

RE: [PATCH 1/1] iwlwifi: Fix built-in compilation of iwlcore

[Chatre, Reinette]

On Wednesday, April 23, 2008 1:52 PM, John W. Linville  wrote:

> On Wed, Apr 23, 2008 at 03:49:43AM -0700, David Miller wrote:
>> From: Tomas Winkler <tomas.winkler@intel.com>
> 
>>> --- a/drivers/net/wireless/iwlwifi/Makefile
>>> +++ b/drivers/net/wireless/iwlwifi/Makefile
>>> @@ -1,4 +1,4 @@
>>> -obj-$(CONFIG_IWLCORE)	:= iwlcore.o
>>> +obj-$(CONFIG_IWLCORE)	+= iwlcore.o
>>>  iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o
iwl-power.o
>> 
>> I had to apply this patch by hand because "iwl-power.o" is not
>> present in the iwlcore-objs line in the current tree.
>> 
>> Does it exist in John's wireless tree or something like that?  This
>> new iwl-power.o object looks like it would be new code and a new
>> feature, which we wouldn't be able to add into the tree at this time
>> as all networking new features have gone into the merge window
>> already.
> 
> FWIW, I don't have an iwl-power.c either.  Please be careful to
> send patches against the actual upstream tree rather than a working
> tree. :-) 

We submitted this patch on top of patches we have already submitted.
iwl-power is introduced in patch "iwlwifi: Add power level support"
submitted on 04/21/2008
(http://marc.info/?l=linux-wireless&m=120881778101353&w=2)

Reinette

[PATCH] iwlwifi: Fix built-in compilation of iwlcore (part 2)

[Zhu Yi]

On Wed, 2008-04-23 at 13:38 +0300, Tomas Winkler wrote:
> This patch fixes problem in Makefile that prevented
> built-in compilation of iwlcore

Here is the second part. Without this,
drivers/net/wireless/iwlwifi/build-in.o will not be linked into vmlinux.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>

diff --git a/drivers/net/wireless/Makefile
b/drivers/net/wireless/Makefile
index 300fc68..41eb08e 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -58,8 +58,7 @@ obj-$(CONFIG_RTL8187)	+= rtl8187.o
 
 obj-$(CONFIG_ADM8211)	+= adm8211.o
 
-obj-$(CONFIG_IWL3945)	+= iwlwifi/
-obj-$(CONFIG_IWL4965)	+= iwlwifi/
+obj-$(CONFIG_IWLCORE)	+= iwlwifi/
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_P54_COMMON)	+= p54/

Re: [PATCH] iwlwifi: Fix built-in compilation of iwlcore (part 2)

[David Miller]

From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 24 Apr 2008 10:31:47 +0800

> On Wed, 2008-04-23 at 13:38 +0300, Tomas Winkler wrote:
> > This patch fixes problem in Makefile that prevented
> > built-in compilation of iwlcore
> 
> Here is the second part. Without this,
> drivers/net/wireless/iwlwifi/build-in.o will not be linked into vmlinux.
> 
> Signed-off-by: Zhu Yi <yi.zhu@intel.com>

Did you guys even test the original patch sent last night at all?

Sigh... I'll add this, thanks.

Re: [PATCH] iwlwifi: Fix built-in compilation of iwlcore (part 2)

[Zhu Yi]

On Wed, 2008-04-23 at 19:43 -0700, David Miller wrote:
> Did you guys even test the original patch sent last night at all?

Sorry, too rush for the first one.

Thanks,
-yi