linux-next: merge of the wireless-next tree into the net-next tree

7 messages, 4 authors, 2012-01-04 · open the first message on its own page

linux-next: merge of the wireless-next tree into the net-next tree

From: Stephen Rothwell <hidden>
Date: 2012-01-03 23:59:58

Hi all,

I noticed that the wireless-next tree has been merged into the net-next
tree today.  Has anything been done about the build failure I reported in
the wireless-next a while ago:

On 12/22/2011 16:58 +1100, Stephen Rothwell wrote:
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ',' or ';' before string constant

I can't figure out what goes wrong here.  On the compile command line,
KBUILD_MODNAME is not defined, but KBUILD_BASE_NAME is.

However, reverting commit fde57764ef87 ("ath6kl: enable USB support")
made the problem go away.  That commit caused the above two files to be
built into two separate modules.

There was some discussion, but I did not notice any fix (I may have
missed it).  I have been reverting that above commit ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: David Miller <davem@davemloft.net>
Date: 2012-01-04 01:30:59

From: Stephen Rothwell <redacted>
Date: Wed, 4 Jan 2012 10:59:47 +1100
I noticed that the wireless-next tree has been merged into the net-next
tree today.  Has anything been done about the build failure I reported in
the wireless-next a while ago:

On 12/22/2011 16:58 +1100, Stephen Rothwell wrote:
quoted
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
It happens on any platform not just powerpc, John please fix this and
don't have known unresolved -next build failures in your tree when you
push to me.

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: Kalle Valo <hidden>
Date: 2012-01-04 08:04:52

Hi,

On 01/04/2012 01:59 AM, Stephen Rothwell wrote:
I noticed that the wireless-next tree has been merged into the net-next
tree today.  Has anything been done about the build failure I reported in
the wireless-next a while ago:

On 12/22/2011 16:58 +1100, Stephen Rothwell wrote:
quoted
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ',' or ';' before string constant

I can't figure out what goes wrong here.  On the compile command line,
KBUILD_MODNAME is not defined, but KBUILD_BASE_NAME is.

However, reverting commit fde57764ef87 ("ath6kl: enable USB support")
made the problem go away.  That commit caused the above two files to be
built into two separate modules.

There was some discussion, but I did not notice any fix (I may have
missed it).  I have been reverting that above commit ...
I started working on adding ath6kl_core.ko module which would fix this,
but unfortunately I got distracted with other things and the patches are
not ready yet. For a temporary solution I'll send a patch which forces
ath6kl to build only as a module and I'll send ath6kl_core.ko patches
ASAP after that.

Kalle

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: John W. Linville <hidden>
Date: 2012-01-04 14:15:58

On Tue, Jan 03, 2012 at 08:27:33PM -0500, David Miller wrote:
From: Stephen Rothwell <redacted>
Date: Wed, 4 Jan 2012 10:59:47 +1100
quoted
I noticed that the wireless-next tree has been merged into the net-next
tree today.  Has anything been done about the build failure I reported in
the wireless-next a while ago:

On 12/22/2011 16:58 +1100, Stephen Rothwell wrote:
quoted
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
It happens on any platform not just powerpc, John please fix this and
don't have known unresolved -next build failures in your tree when you
push to me.
I'm sorry, Dave.  I must have let this slip my mind over the holidays
-- maybe this explains why I didn't send the pull request before
Christmas...

Kalle has sent a temporary fix that sidesteps the issue by forcing the
SDIO and USB versions of ath6kl to be built as modules.  I'll forward
that on to you today.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: David Miller <davem@davemloft.net>
Date: 2012-01-04 18:27:43

From: Kalle Valo <redacted>
Date: Wed, 4 Jan 2012 10:02:33 +0200
For a temporary solution I'll send a patch which forces ath6kl to
build only as a module and I'll send ath6kl_core.ko patches ASAP
after that.
That's not reasonable, fix it properly.

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: David Miller <davem@davemloft.net>
Date: 2012-01-04 18:36:00

From: "John W. Linville" <redacted>
Date: Wed, 4 Jan 2012 09:02:10 -0500
Kalle has sent a temporary fix that sidesteps the issue by forcing the
SDIO and USB versions of ath6kl to be built as modules.  I'll forward
that on to you today.
I'm not applying a temporary fix.  I want a proper fix or a revert.

Do NOT apply any other patches from the ath6kl folks until either
a proper fix is available or the changes that caused this problem
are completely reverted from my tree.

Re: linux-next: merge of the wireless-next tree into the net-next tree

From: Kalle Valo <hidden>
Date: 2012-01-04 18:50:59

On 01/04/2012 08:24 PM, David Miller wrote:
From: Kalle Valo <redacted>
Date: Wed, 4 Jan 2012 10:02:33 +0200
quoted
For a temporary solution I'll send a patch which forces ath6kl to
build only as a module and I'll send ath6kl_core.ko patches ASAP
after that.
That's not reasonable, fix it properly.
I will, I have the patches almost ready now. Will send them tonight.
Just wanted to send a quick fix first.

Sorry about the whole mess. I was sure that I compile tested the usb
code properly when I added them, but apparently I didn't.

Kalle
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help