linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: wireless tree build failure
@ 2009-04-22  1:57 Stephen Rothwell
  2009-04-22  8:59 ` Johannes Berg
  2009-04-28  3:28 ` Stephen Rothwell
  0 siblings, 2 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-04-22  1:57 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, Johannes Berg, Matthew Garrett, Len Brown

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

Hi John,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_init':
drivers/platform/x86/oqo-wmi.c:767: error: 'struct rfkill' has no member named 'user_claim_unsupported'

Caused by commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 ("rfkill:
remove user_claim stuff") interacting with commit
03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86: Add oqo-wmi
driver for model 2 OQO backlight and rfkill control") from the acpi tree.

I have reverted commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 for today.

Johannes, maybe you could suggest a patch for the acpi guys?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-22  1:57 linux-next: wireless tree build failure Stephen Rothwell
@ 2009-04-22  8:59 ` Johannes Berg
  2009-04-22 13:03   ` Stephen Rothwell
  2009-04-28  3:28 ` Stephen Rothwell
  1 sibling, 1 reply; 28+ messages in thread
From: Johannes Berg @ 2009-04-22  8:59 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: John W. Linville, linux-next, Matthew Garrett, Len Brown

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

Hi Stephen,

> drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_init':
> drivers/platform/x86/oqo-wmi.c:767: error: 'struct rfkill' has no member named 'user_claim_unsupported'
> 
> Caused by commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 ("rfkill:
> remove user_claim stuff") interacting with commit
> 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86: Add oqo-wmi
> driver for model 2 OQO backlight and rfkill control") from the acpi tree.
> 
> I have reverted commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 for today.
> 
> Johannes, maybe you could suggest a patch for the acpi guys?

Fun. Another rfkill problem. It'll get worse -- I have a complete rfkill
rewrite in the pipeline. For this part it's easy, just remove
user_claim_unsupported use from the driver.

Any suggestions on how to handle the other merge problems?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-22  8:59 ` Johannes Berg
@ 2009-04-22 13:03   ` Stephen Rothwell
  2009-04-22 13:06     ` John W. Linville
  2009-04-22 13:11     ` Johannes Berg
  0 siblings, 2 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-04-22 13:03 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John W. Linville, linux-next, Matthew Garrett, Len Brown

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

Hi Johannes,

On Wed, 22 Apr 2009 10:59:06 +0200 Johannes Berg <johannes@sipsolutions.net> wrote:
>
> Fun. Another rfkill problem. It'll get worse -- I have a complete rfkill
> rewrite in the pipeline. For this part it's easy, just remove
> user_claim_unsupported use from the driver.
> 
> Any suggestions on how to handle the other merge problems?

Well, the best way (and I know this is simplistic and maybe difficult) is
to introduce the new rewrite alongside the old code and then slowly move
the clients of the API over.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-22 13:03   ` Stephen Rothwell
@ 2009-04-22 13:06     ` John W. Linville
  2009-04-22 13:33       ` Johannes Berg
  2009-04-22 13:11     ` Johannes Berg
  1 sibling, 1 reply; 28+ messages in thread
From: John W. Linville @ 2009-04-22 13:06 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Johannes Berg, linux-next, Matthew Garrett, Len Brown

On Wed, Apr 22, 2009 at 11:03:33PM +1000, Stephen Rothwell wrote:
> Hi Johannes,
> 
> On Wed, 22 Apr 2009 10:59:06 +0200 Johannes Berg <johannes@sipsolutions.net> wrote:
> >
> > Fun. Another rfkill problem. It'll get worse -- I have a complete rfkill
> > rewrite in the pipeline. For this part it's easy, just remove
> > user_claim_unsupported use from the driver.
> > 
> > Any suggestions on how to handle the other merge problems?
> 
> Well, the best way (and I know this is simplistic and maybe difficult) is
> to introduce the new rewrite alongside the old code and then slowly move
> the clients of the API over.

Maybe we should put user_claim_unsupported back into struct rfkill
(and deprecate it) for now?

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

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

* Re: linux-next: wireless tree build failure
  2009-04-22 13:03   ` Stephen Rothwell
  2009-04-22 13:06     ` John W. Linville
@ 2009-04-22 13:11     ` Johannes Berg
  1 sibling, 0 replies; 28+ messages in thread
From: Johannes Berg @ 2009-04-22 13:11 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: John W. Linville, linux-next, Matthew Garrett, Len Brown

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

Hi Stephen,

> > Fun. Another rfkill problem. It'll get worse -- I have a complete rfkill
> > rewrite in the pipeline. For this part it's easy, just remove
> > user_claim_unsupported use from the driver.
> > 
> > Any suggestions on how to handle the other merge problems?
> 
> Well, the best way (and I know this is simplistic and maybe difficult) is
> to introduce the new rewrite alongside the old code and then slowly move
> the clients of the API over.

I wish. But in this case, I don't see how that is possible without
duplicating the entire rfkill framework, moving over and then deleting
the old version.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-22 13:06     ` John W. Linville
@ 2009-04-22 13:33       ` Johannes Berg
  2009-04-22 13:36         ` Matthew Garrett
  0 siblings, 1 reply; 28+ messages in thread
From: Johannes Berg @ 2009-04-22 13:33 UTC (permalink / raw)
  To: John W. Linville; +Cc: Stephen Rothwell, linux-next, Matthew Garrett, Len Brown

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

On Wed, 2009-04-22 at 09:06 -0400, John W. Linville wrote:
> On Wed, Apr 22, 2009 at 11:03:33PM +1000, Stephen Rothwell wrote:

> > On Wed, 22 Apr 2009 10:59:06 +0200 Johannes Berg <johannes@sipsolutions.net> wrote:
> > >
> > > Fun. Another rfkill problem. It'll get worse -- I have a complete rfkill
> > > rewrite in the pipeline. For this part it's easy, just remove
> > > user_claim_unsupported use from the driver.
> > > 
> > > Any suggestions on how to handle the other merge problems?
> > 
> > Well, the best way (and I know this is simplistic and maybe difficult) is
> > to introduce the new rewrite alongside the old code and then slowly move
> > the clients of the API over.
> 
> Maybe we should put user_claim_unsupported back into struct rfkill
> (and deprecate it) for now?

Sure, we can add the member in the struct back, and just never look at
it since we've removed user claiming anyway.

But that's not the interesting part -- the thing is the rfkill rewrite.
I don't know how to handle that w/o breaking all users. I had hoped to
finish this very soon to be ready early in .31, but I'm still waiting
for Thinkpad and Toshiba conversions (and I forgot who wanted to look at
Toshiba), but if new users are being added in other trees then that's a
problem.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-22 13:33       ` Johannes Berg
@ 2009-04-22 13:36         ` Matthew Garrett
  2009-06-03  2:52           ` Stephen Rothwell
  0 siblings, 1 reply; 28+ messages in thread
From: Matthew Garrett @ 2009-04-22 13:36 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John W. Linville, Stephen Rothwell, linux-next, Len Brown

On Wed, Apr 22, 2009 at 03:33:11PM +0200, Johannes Berg wrote:
> But that's not the interesting part -- the thing is the rfkill rewrite.
> I don't know how to handle that w/o breaking all users. I had hoped to
> finish this very soon to be ready early in .31, but I'm still waiting
> for Thinkpad and Toshiba conversions (and I forgot who wanted to look at
> Toshiba), but if new users are being added in other trees then that's a
> problem.

oqo-wmi can be ignored for the moment - Len, can you drop it from your 
tree for now? I'll clean that bit up as well.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

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

* Re: linux-next: wireless tree build failure
  2009-04-22  1:57 linux-next: wireless tree build failure Stephen Rothwell
  2009-04-22  8:59 ` Johannes Berg
@ 2009-04-28  3:28 ` Stephen Rothwell
  2009-04-28 12:50   ` John W. Linville
  1 sibling, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-04-28  3:28 UTC (permalink / raw)
  To: John W. Linville, Len Brown; +Cc: linux-next, Johannes Berg, Matthew Garrett

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

Hi John, Len,

On Wed, 22 Apr 2009 11:57:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_init':
> drivers/platform/x86/oqo-wmi.c:767: error: 'struct rfkill' has no member named 'user_claim_unsupported'
> 
> Caused by commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 ("rfkill:
> remove user_claim stuff") interacting with commit
> 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86: Add oqo-wmi
> driver for model 2 OQO backlight and rfkill control") from the acpi tree.
> 
> I have reverted commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 for today.

This is still happening ... is someone going to do something about it?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-04-28  3:28 ` Stephen Rothwell
@ 2009-04-28 12:50   ` John W. Linville
  0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2009-04-28 12:50 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Len Brown, linux-next, Johannes Berg, Matthew Garrett

On Tue, Apr 28, 2009 at 01:28:17PM +1000, Stephen Rothwell wrote:
> Hi John, Len,
> 
> On Wed, 22 Apr 2009 11:57:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_init':
> > drivers/platform/x86/oqo-wmi.c:767: error: 'struct rfkill' has no member named 'user_claim_unsupported'
> > 
> > Caused by commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 ("rfkill:
> > remove user_claim stuff") interacting with commit
> > 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86: Add oqo-wmi
> > driver for model 2 OQO backlight and rfkill control") from the acpi tree.
> > 
> > I have reverted commit bc3e4095713c0bf57c8c9c1e91d93d6654075079 for today.
> 
> This is still happening ... is someone going to do something about it?

Sorry, I mostly forgot about it after Matthew asked for that driver
to be dropped...?

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

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

* Re: linux-next: wireless tree build failure
  2009-04-22 13:36         ` Matthew Garrett
@ 2009-06-03  2:52           ` Stephen Rothwell
  2009-06-15 12:21             ` Stephen Rothwell
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-06-03  2:52 UTC (permalink / raw)
  To: Matthew Garrett; +Cc: Johannes Berg, John W. Linville, linux-next, Len Brown

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

Hi all,

On Wed, 22 Apr 2009 14:36:01 +0100 Matthew Garrett <mjg59@srcf.ucam.org> wrote:
>
> On Wed, Apr 22, 2009 at 03:33:11PM +0200, Johannes Berg wrote:
> > But that's not the interesting part -- the thing is the rfkill rewrite.
> > I don't know how to handle that w/o breaking all users. I had hoped to
> > finish this very soon to be ready early in .31, but I'm still waiting
> > for Thinkpad and Toshiba conversions (and I forgot who wanted to look at
> > Toshiba), but if new users are being added in other trees then that's a
> > problem.
> 
> oqo-wmi can be ignored for the moment - Len, can you drop it from your 
> tree for now? I'll clean that bit up as well.

So the rfkill rewrite has now hit the wireless tree, so today's build
(x86_64_allmodconfig) failure looks like this:

drivers/platform/x86/oqo-wmi.c:716: warning: 'enum rfkill_state' declared inside parameter list
drivers/platform/x86/oqo-wmi.c:716: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_get':
drivers/platform/x86/oqo-wmi.c:727: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:727: error: 'RFKILL_STATE_SOFT_BLOCKED' undeclared (first use in this function)
drivers/platform/x86/oqo-wmi.c:729: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:729: error: 'RFKILL_STATE_UNBLOCKED' undeclared (first use in this function)
drivers/platform/x86/oqo-wmi.c: At top level:
drivers/platform/x86/oqo-wmi.c:734: warning: 'enum rfkill_state' declared inside parameter list
drivers/platform/x86/oqo-wmi.c:734: error: parameter 2 ('state') has incomplete type
drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_toggle':
drivers/platform/x86/oqo-wmi.c:740: error: 'RFKILL_STATE_UNBLOCKED' undeclared (first use in this function)
drivers/platform/x86/oqo-wmi.c: In function 'oqo_rfkill_init':
drivers/platform/x86/oqo-wmi.c:752: error: implicit declaration of function 'rfkill_allocate'
drivers/platform/x86/oqo-wmi.c:752: warning: assignment makes pointer from integer without a cast
drivers/platform/x86/oqo-wmi.c:759: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:761: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:761: error: 'RFKILL_STATE_SOFT_BLOCKED' undeclared (first use in this function)
drivers/platform/x86/oqo-wmi.c:763: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:763: error: 'RFKILL_STATE_UNBLOCKED' undeclared (first use in this function)
drivers/platform/x86/oqo-wmi.c:765: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:766: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:767: error: dereferencing pointer to incomplete type
drivers/platform/x86/oqo-wmi.c:772: error: implicit declaration of function 'rfkill_free'

So I have reverted commit 9c82cd255907ad639bed4ffc8fcaf1bd59badb50
("platform/x86: Add oqo-wmi driver for model 2 OQO backlight and rfkill
control") and commit 94c4b5977f33894cc316edf07c5cb72b5d193628 ("oqo:
dev_set_name()") that depend son it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-06-03  2:52           ` Stephen Rothwell
@ 2009-06-15 12:21             ` Stephen Rothwell
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-06-15 12:21 UTC (permalink / raw)
  To: Len Brown
  Cc: Johannes Berg, John W. Linville, linux-next, Matthew Garrett,
	David S. Miller

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

Hi Len,

On Wed, 3 Jun 2009 12:52:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 22 Apr 2009 14:36:01 +0100 Matthew Garrett <mjg59@srcf.ucam.org> wrote:
> >
> > On Wed, Apr 22, 2009 at 03:33:11PM +0200, Johannes Berg wrote:
> > > But that's not the interesting part -- the thing is the rfkill rewrite.
> > > I don't know how to handle that w/o breaking all users. I had hoped to
> > > finish this very soon to be ready early in .31, but I'm still waiting
> > > for Thinkpad and Toshiba conversions (and I forgot who wanted to look at
> > > Toshiba), but if new users are being added in other trees then that's a
> > > problem.
> > 
> > oqo-wmi can be ignored for the moment - Len, can you drop it from your 
> > tree for now? I'll clean that bit up as well.
> 
> So the rfkill rewrite has now hit the wireless tree, so today's build
> (x86_64_allmodconfig) failure looks like this:

So I have been dropping the oqo-wmi driver since April 22 ... Dave has
now sent the pull request to Linus for the net tree (which contains the
wireless tree) so after Linus merges it, the acpi tree will be broken
when merged with Linus' tree.  Can this be fixed, please?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-11-09  8:08 Stephen Rothwell
@ 2009-11-09 13:37 ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 28+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-11-09 13:37 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel


Hi,

On Monday 09 November 2009 09:08:12 Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:

This was fixed yesterday by Hauke Mehrtens for wireless-testing
(http://patchwork.kernel.org/patch/58495/) and in the way preserving
bisectability in rt2800 tree.

Stephen, until someone explains me how they would like to coordinate
patch-flow w/ rt2800 tree please do not cc: me on rt2x00 patches as
I have completely no control over what people are doing with my patches
posted to linux-wireless for review.

[ Yesterday I've just noticed by accident (mail from Hauke) that older
  versions of my patches were merged into wireless-testing. ]

--
Bartlomiej Zolnierkiewicz

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

* linux-next: wireless tree build failure
@ 2009-11-09  8:08 Stephen Rothwell
  2009-11-09 13:37 ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-11-09  8:08 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, linux-kernel, Bartlomiej Zolnierkiewicz

Hi John,

Today's linux-next build (powerpc allyesconfig) failed like this:

In file included from drivers/net/wireless/rt2x00/rt2800lib.c:35:
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_vendor_request_sw':
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_DIR_OUT' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_eeprom_read':
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_DIR_IN' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_read':
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_DIR_IN' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_read_lock':
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_DIR_IN' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_multiread':
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_DIR_IN' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_write':
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_DIR_OUT' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_write_lock':
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_DIR_OUT' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function 'rt2x00usb_register_multiwrite':
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_DIR_OUT' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_TYPE_VENDOR' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_RECIP_DEVICE' undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: At top level:
drivers/net/wireless/rt2x00/rt2x00usb.h:439: warning: 'struct usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:439: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/net/wireless/rt2x00/rt2x00usb.h:440: warning: 'struct usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:442: warning: 'struct usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:443: warning: 'struct usb_interface' declared inside parameter list

Presumably because drivers/net/wireless/rt2x00/rt2x00usb.h needs to have
linux/usb/ch9.h included.

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 19:04:19 +1100
Subject: [PATCH] wireless/rt2x00usb: include usb.h to get needed constants

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/rt2x00/rt2x00usb.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 9943e42..1c9d6ca 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -26,6 +26,8 @@
 #ifndef RT2X00USB_H
 #define RT2X00USB_H
 
+#include <linux/usb.h>
+
 #define to_usb_device_intf(d) \
 ({ \
 	struct usb_interface *intf = to_usb_interface(d); \
-- 
1.6.5.2


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

* Re: linux-next: wireless tree build failure
       [not found] <20090505115455.0b147aeb.sfr@canb.auug.org.au>
@ 2009-05-05  2:55 ` John W. Linville
  0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2009-05-05  2:55 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, Luis R. Rodriguez

On Tue, May 05, 2009 at 11:54:55AM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next build (x86_64_allmodconfig) failed like this:
> 
> net/mac80211/mlme.c: In function 'ieee80211_enable_ht':
> net/mac80211/mlme.c:126: error: 'IEEE80211_CHAN_NO_HT40PLUS' undeclared (first use in this function)
> net/mac80211/mlme.c:131: error: 'IEEE80211_CHAN_NO_HT40MINUS' undeclared (first use in this function)
> 
> Direct cause is commit b3afed6815165a62d20e4487ec2df0d12a2df20d
> ("mac80211: check if HT40+/- is allowed before sending assoc").
> 
> I have used the wireless tree from next-20090504 for today.
> 
> [You guys build this stuff, right? :-(]

Ooops, sorry!  I had to drop a few patches and I didn't get
wireless-next-2.6 pushed back out correctly.  It is fixed now.

Thanks,

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

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

* Re: linux-next: wireless tree build failure
  2009-03-23  7:59     ` David Miller
@ 2009-03-23  8:10       ` Stephen Rothwell
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-03-23  8:10 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, yanghy

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

Hi Dave,

On Mon, 23 Mar 2009 00:59:51 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Thanks for testing Stephen.

No problem.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-03-23  5:48   ` Stephen Rothwell
@ 2009-03-23  7:59     ` David Miller
  2009-03-23  8:10       ` Stephen Rothwell
  0 siblings, 1 reply; 28+ messages in thread
From: David Miller @ 2009-03-23  7:59 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, yanghy

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Mar 2009 16:48:18 +1100

> On Sun, 22 Mar 2009 21:55:41 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> >
> > Stephen does this fix the build for you?
> 
> It fixes that build failure, yes (I just built that one file before and
> after applying your patch).

Thanks for testing Stephen.

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

* Re: linux-next: wireless tree build failure
  2009-03-23  4:55 ` David Miller
  2009-03-23  5:06   ` Yang Hongyang
@ 2009-03-23  5:48   ` Stephen Rothwell
  2009-03-23  7:59     ` David Miller
  1 sibling, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-03-23  5:48 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, yanghy

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

Hi Dave,

On Sun, 22 Mar 2009 21:55:41 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Stephen does this fix the build for you?

It fixes that build failure, yes (I just built that one file before and
after applying your patch).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-03-23  4:55 ` David Miller
@ 2009-03-23  5:06   ` Yang Hongyang
  2009-03-23  5:48   ` Stephen Rothwell
  1 sibling, 0 replies; 28+ messages in thread
From: Yang Hongyang @ 2009-03-23  5:06 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, linux-next

David Miller wrote:
> Stephen does this fix the build for you?
> 
> I want to have you test it before I commit because unlike
> some people I'd like to build test changes before submitting
> them anywhere.
> 
> Yang, I am pretty pissed at you, this is beyond unforgivable.
> There is zero excuse for this build regression.

I'm so sorry for that.This is the only patch that I do not build
test for because I think it's too simple.It turns out that I am
totally wrong and I was shamed about that.It's a painful lesson
to me.

> 
> Grumble!
> 
> diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
> index 136d9f1..0288054 100644
> --- a/drivers/net/spider_net.c
> +++ b/drivers/net/spider_net.c
> @@ -2260,18 +2260,18 @@ spider_net_tx_timeout(struct net_device *netdev)
>  }
>  
>  static const struct net_device_ops spider_net_ops = {
> -	.ndo_open		= spider_net_open;
> -	.ndo_stop		= spider_net_stop;
> -	.ndo_start_xmit		= spider_net_xmit;
> -	.ndo_set_multicast_list	= spider_net_set_multi;
> -	.ndo_set_mac_address	= spider_net_set_mac;
> -	.ndo_change_mtu		= spider_net_change_mtu;
> -	.ndo_do_ioctl		= spider_net_do_ioctl;
> -	.ndo_tx_timeout		= spider_net_tx_timeout;
> +	.ndo_open		= spider_net_open,
> +	.ndo_stop		= spider_net_stop,
> +	.ndo_start_xmit		= spider_net_xmit,
> +	.ndo_set_multicast_list	= spider_net_set_multi,
> +	.ndo_set_mac_address	= spider_net_set_mac,
> +	.ndo_change_mtu		= spider_net_change_mtu,
> +	.ndo_do_ioctl		= spider_net_do_ioctl,
> +	.ndo_tx_timeout		= spider_net_tx_timeout,
>  	/* HW VLAN */
>  #ifdef CONFIG_NET_POLL_CONTROLLER
>  	/* poll controller */
> -	.ndo_poll_controller	= spider_net_poll_controller;
> +	.ndo_poll_controller	= spider_net_poll_controller,
>  #endif /* CONFIG_NET_POLL_CONTROLLER */
>  };
>  
> 
> 


-- 
Regards
Yang Hongyang

◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆
◆
◇   富士通邀请您参加“地球一小时”活动 
◆      http://www.fujitsu.com/cn/about/earth_hour.html
◇   
◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆

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

* Re: linux-next: wireless tree build failure
  2009-03-23  4:53 ` David Miller
@ 2009-03-23  5:01   ` Yang Hongyang
  0 siblings, 0 replies; 28+ messages in thread
From: Yang Hongyang @ 2009-03-23  5:01 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, linux-next

David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 23 Mar 2009 15:39:54 +1100
> 
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> drivers/net/spider_net.c:2263: error: expected '}' before ';' token
>>
>> Caused by commit 6e06cb626229567629e1dc6eed9399bec549f3cf ("spider_net:
>> Convert to net_device_ops").
>>
>> Clearly never even build tested (or looked at very hard).
>>
>> I have used the version of the net tree from next-20090320 for today
> 
> Sorry about that Stephen, I'll fix it up.
> 
> Yang, don't send me patches you don't even build test.

Dave,I'm terribly sorry for the mistake.I won't send patches that
don't pass build test any more.It's my fault.

> 
> 
> 


-- 
Regards
Yang Hongyang

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

* Re: linux-next: wireless tree build failure
  2009-03-23  4:39 Stephen Rothwell
  2009-03-23  4:53 ` David Miller
@ 2009-03-23  4:55 ` David Miller
  2009-03-23  5:06   ` Yang Hongyang
  2009-03-23  5:48   ` Stephen Rothwell
  1 sibling, 2 replies; 28+ messages in thread
From: David Miller @ 2009-03-23  4:55 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, yanghy


Stephen does this fix the build for you?

I want to have you test it before I commit because unlike
some people I'd like to build test changes before submitting
them anywhere.

Yang, I am pretty pissed at you, this is beyond unforgivable.
There is zero excuse for this build regression.

Grumble!

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 136d9f1..0288054 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -2260,18 +2260,18 @@ spider_net_tx_timeout(struct net_device *netdev)
 }
 
 static const struct net_device_ops spider_net_ops = {
-	.ndo_open		= spider_net_open;
-	.ndo_stop		= spider_net_stop;
-	.ndo_start_xmit		= spider_net_xmit;
-	.ndo_set_multicast_list	= spider_net_set_multi;
-	.ndo_set_mac_address	= spider_net_set_mac;
-	.ndo_change_mtu		= spider_net_change_mtu;
-	.ndo_do_ioctl		= spider_net_do_ioctl;
-	.ndo_tx_timeout		= spider_net_tx_timeout;
+	.ndo_open		= spider_net_open,
+	.ndo_stop		= spider_net_stop,
+	.ndo_start_xmit		= spider_net_xmit,
+	.ndo_set_multicast_list	= spider_net_set_multi,
+	.ndo_set_mac_address	= spider_net_set_mac,
+	.ndo_change_mtu		= spider_net_change_mtu,
+	.ndo_do_ioctl		= spider_net_do_ioctl,
+	.ndo_tx_timeout		= spider_net_tx_timeout,
 	/* HW VLAN */
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	/* poll controller */
-	.ndo_poll_controller	= spider_net_poll_controller;
+	.ndo_poll_controller	= spider_net_poll_controller,
 #endif /* CONFIG_NET_POLL_CONTROLLER */
 };
 

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

* Re: linux-next: wireless tree build failure
  2009-03-23  4:39 Stephen Rothwell
@ 2009-03-23  4:53 ` David Miller
  2009-03-23  5:01   ` Yang Hongyang
  2009-03-23  4:55 ` David Miller
  1 sibling, 1 reply; 28+ messages in thread
From: David Miller @ 2009-03-23  4:53 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, yanghy

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Mar 2009 15:39:54 +1100

> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/net/spider_net.c:2263: error: expected '}' before ';' token
> 
> Caused by commit 6e06cb626229567629e1dc6eed9399bec549f3cf ("spider_net:
> Convert to net_device_ops").
> 
> Clearly never even build tested (or looked at very hard).
> 
> I have used the version of the net tree from next-20090320 for today

Sorry about that Stephen, I'll fix it up.

Yang, don't send me patches you don't even build test.

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

* linux-next: wireless tree build failure
@ 2009-03-23  4:39 Stephen Rothwell
  2009-03-23  4:53 ` David Miller
  2009-03-23  4:55 ` David Miller
  0 siblings, 2 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-03-23  4:39 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, Yang Hongyang

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

Hi Dave,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/net/spider_net.c:2263: error: expected '}' before ';' token

Caused by commit 6e06cb626229567629e1dc6eed9399bec549f3cf ("spider_net:
Convert to net_device_ops").

Clearly never even build tested (or looked at very hard).

I have used the version of the net tree from next-20090320 for today
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* linux-next: wireless tree build failure
@ 2009-02-27  2:44 Stephen Rothwell
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-02-27  2:44 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, Kalle Valo, Kay Sievers, Greg KH

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

Hi John,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/wireless/at76c50x-usb.c: In function 'at76_init_new_device':
drivers/net/wireless/at76c50x-usb.c:2271: error: 'struct device' has no member named 'bus_id'

Caused by commit 26b9886dbb1e6930a8a5df9dcf64d8dacb80597b ("at76c50x-usb:
add driver") from the wireless tree interacting with commit
d3592c7c13d14e410ffbf0e86dcd7abb3a23077f ("driver core: get rid of struct
device's bus_id string array") from the driver-core tree.

This can be fixed by using dev_name() which is already available in
Linus' tree.

I have dropped the wireless tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-02-13 18:24   ` Dave
@ 2009-02-13 18:24     ` John W. Linville
  0 siblings, 0 replies; 28+ messages in thread
From: John W. Linville @ 2009-02-13 18:24 UTC (permalink / raw)
  To: Dave; +Cc: Stephen Rothwell, linux-next

On Fri, Feb 13, 2009 at 06:24:30PM +0000, Dave wrote:
> John W. Linville wrote:
> > On Thu, Feb 12, 2009 at 07:35:17PM +1100, Stephen Rothwell wrote:
> >> Today's linux-next build (powerpc allyesconfig) failed like this:
> >>
> >> net/built-in.o: In function `michael_mic':
> >> (.opd+0x3ba78): multiple definition of `michael_mic'
> >> drivers/built-in.o:(.opd+0x552a8): first defined here
> >> net/built-in.o: In function `michael_mic':
> >> net/mac80211/michael.c:58: multiple definition of `.michael_mic'
> >> drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
> >>
> >> Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
> >> ("orinoco: Move MIC helpers into new file").
> > 
> > I'll fix this up with a patch like below...
> > 
> > John
> 
> I guess it only worked for me because I'm building modules.
> 
> Anyway, the fix needs to be slightly different:
> 
> > diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/orinoco/mic.c
> > index c39d9ea..8cdac75 100644
> > --- a/drivers/net/wireless/orinoco/mic.c
> > +++ b/drivers/net/wireless/orinoco/mic.c
> > @@ -16,18 +16,18 @@
> >  /********************************************************************/
> >  int orinoco_mic_init(struct orinoco_private *priv)
> >  {
> > -	priv->tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> > +	priv->tx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
> 
> That wants to remain as michael_mic, so we get the right crypto alg.
> 
> >  	if (IS_ERR(priv->tx_tfm_mic)) {
> >  		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> > -		       "crypto API michael_mic\n");
> > +		       "crypto API orinoco_mic\n");
> 
> Since we're referring to the crypto alg, I suggest this stay the same.
> 
> >  		priv->tx_tfm_mic = NULL;
> >  		return -ENOMEM;
> >  	}
> >  
> > -	priv->rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> > +	priv->rx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
> 
> Ditto 1.
> 
> >  	if (IS_ERR(priv->rx_tfm_mic)) {
> >  		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> > -		       "crypto API michael_mic\n");
> > +		       "crypto API orinoco_mic\n");
> 
> Ditto 2.
> 
> The rest is fine.

Right, Johannes already scolded me.  Sloppy search-n-replace... :-)

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

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

* Re: linux-next: wireless tree build failure
  2009-02-12 16:16 ` John W. Linville
  2009-02-12 22:07   ` Stephen Rothwell
@ 2009-02-13 18:24   ` Dave
  2009-02-13 18:24     ` John W. Linville
  1 sibling, 1 reply; 28+ messages in thread
From: Dave @ 2009-02-13 18:24 UTC (permalink / raw)
  To: John W. Linville; +Cc: Stephen Rothwell, linux-next, David Kilroy

John W. Linville wrote:
> On Thu, Feb 12, 2009 at 07:35:17PM +1100, Stephen Rothwell wrote:
>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>
>> net/built-in.o: In function `michael_mic':
>> (.opd+0x3ba78): multiple definition of `michael_mic'
>> drivers/built-in.o:(.opd+0x552a8): first defined here
>> net/built-in.o: In function `michael_mic':
>> net/mac80211/michael.c:58: multiple definition of `.michael_mic'
>> drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
>>
>> Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
>> ("orinoco: Move MIC helpers into new file").
> 
> I'll fix this up with a patch like below...
> 
> John

I guess it only worked for me because I'm building modules.

Anyway, the fix needs to be slightly different:

> diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/orinoco/mic.c
> index c39d9ea..8cdac75 100644
> --- a/drivers/net/wireless/orinoco/mic.c
> +++ b/drivers/net/wireless/orinoco/mic.c
> @@ -16,18 +16,18 @@
>  /********************************************************************/
>  int orinoco_mic_init(struct orinoco_private *priv)
>  {
> -	priv->tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> +	priv->tx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);

That wants to remain as michael_mic, so we get the right crypto alg.

>  	if (IS_ERR(priv->tx_tfm_mic)) {
>  		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> -		       "crypto API michael_mic\n");
> +		       "crypto API orinoco_mic\n");

Since we're referring to the crypto alg, I suggest this stay the same.

>  		priv->tx_tfm_mic = NULL;
>  		return -ENOMEM;
>  	}
>  
> -	priv->rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
> +	priv->rx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);

Ditto 1.

>  	if (IS_ERR(priv->rx_tfm_mic)) {
>  		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
> -		       "crypto API michael_mic\n");
> +		       "crypto API orinoco_mic\n");

Ditto 2.

The rest is fine.



Regards,

Dave.

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

* Re: linux-next: wireless tree build failure
  2009-02-12 16:16 ` John W. Linville
@ 2009-02-12 22:07   ` Stephen Rothwell
  2009-02-13 18:24   ` Dave
  1 sibling, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2009-02-12 22:07 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, David Kilroy

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

Hi John,

On Thu, 12 Feb 2009 11:16:40 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I'll fix this up with a patch like below...

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

* Re: linux-next: wireless tree build failure
  2009-02-12  8:35 Stephen Rothwell
@ 2009-02-12 16:16 ` John W. Linville
  2009-02-12 22:07   ` Stephen Rothwell
  2009-02-13 18:24   ` Dave
  0 siblings, 2 replies; 28+ messages in thread
From: John W. Linville @ 2009-02-12 16:16 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, David Kilroy

On Thu, Feb 12, 2009 at 07:35:17PM +1100, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> net/built-in.o: In function `michael_mic':
> (.opd+0x3ba78): multiple definition of `michael_mic'
> drivers/built-in.o:(.opd+0x552a8): first defined here
> net/built-in.o: In function `michael_mic':
> net/mac80211/michael.c:58: multiple definition of `.michael_mic'
> drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
> 
> Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
> ("orinoco: Move MIC helpers into new file").
> 
> I have reverted that commit (and several following ones that conflicted
> with the revert - see below) for today.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier"
> Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module"
> Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module"
> Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file"
> Created commit e668502: Revert "orinoco: Move hardware functions into separate file"
> Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode"
> Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables"
> Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file"
> Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"

I'll fix this up with a patch like below...

John

diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 0cc1f05..f045444 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -931,7 +931,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
 			len = MICHAEL_MIC_LEN;
 		}
 
-		michael_mic(priv->tx_tfm_mic,
+		orinoco_mic(priv->tx_tfm_mic,
 			    priv->tkip_key[priv->tx_key].tx_mic,
 			    eh->h_dest, eh->h_source, 0 /* priority */,
 			    skb->data + ETH_HLEN, skb->len - ETH_HLEN, mic);
@@ -1409,7 +1409,7 @@ static void orinoco_rx(struct net_device *dev,
 		skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
 		length -= MICHAEL_MIC_LEN;
 
-		michael_mic(priv->rx_tfm_mic,
+		orinoco_mic(priv->rx_tfm_mic,
 			    priv->tkip_key[key_id].rx_mic,
 			    desc->addr1,
 			    src,
diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/orinoco/mic.c
index c39d9ea..8cdac75 100644
--- a/drivers/net/wireless/orinoco/mic.c
+++ b/drivers/net/wireless/orinoco/mic.c
@@ -16,18 +16,18 @@
 /********************************************************************/
 int orinoco_mic_init(struct orinoco_private *priv)
 {
-	priv->tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
+	priv->tx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
 	if (IS_ERR(priv->tx_tfm_mic)) {
 		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
-		       "crypto API michael_mic\n");
+		       "crypto API orinoco_mic\n");
 		priv->tx_tfm_mic = NULL;
 		return -ENOMEM;
 	}
 
-	priv->rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
+	priv->rx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
 	if (IS_ERR(priv->rx_tfm_mic)) {
 		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
-		       "crypto API michael_mic\n");
+		       "crypto API orinoco_mic\n");
 		priv->rx_tfm_mic = NULL;
 		return -ENOMEM;
 	}
@@ -43,7 +43,7 @@ void orinoco_mic_free(struct orinoco_private *priv)
 		crypto_free_hash(priv->rx_tfm_mic);
 }
 
-int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
+int orinoco_mic(struct crypto_hash *tfm_michael, u8 *key,
 		u8 *da, u8 *sa, u8 priority,
 		u8 *data, size_t data_len, u8 *mic)
 {
@@ -52,7 +52,7 @@ int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
 	u8 hdr[ETH_HLEN + 2]; /* size of header + padding */
 
 	if (tfm_michael == NULL) {
-		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+		printk(KERN_WARNING "orinoco_mic: tfm_michael == NULL\n");
 		return -1;
 	}
 
diff --git a/drivers/net/wireless/orinoco/mic.h b/drivers/net/wireless/orinoco/mic.h
index bc1db16..04d05bc 100644
--- a/drivers/net/wireless/orinoco/mic.h
+++ b/drivers/net/wireless/orinoco/mic.h
@@ -15,7 +15,7 @@ struct crypto_hash;
 
 int orinoco_mic_init(struct orinoco_private *priv);
 void orinoco_mic_free(struct orinoco_private *priv);
-int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
+int orinoco_mic(struct crypto_hash *tfm_michael, u8 *key,
 		u8 *da, u8 *sa, u8 priority,
 		u8 *data, size_t data_len, u8 *mic);
 

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

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

* linux-next: wireless tree build failure
@ 2009-02-12  8:35 Stephen Rothwell
  2009-02-12 16:16 ` John W. Linville
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2009-02-12  8:35 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, David Kilroy

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

Hi John,

Today's linux-next build (powerpc allyesconfig) failed like this:

net/built-in.o: In function `michael_mic':
(.opd+0x3ba78): multiple definition of `michael_mic'
drivers/built-in.o:(.opd+0x552a8): first defined here
net/built-in.o: In function `michael_mic':
net/mac80211/michael.c:58: multiple definition of `.michael_mic'
drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here

Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
("orinoco: Move MIC helpers into new file").

I have reverted that commit (and several following ones that conflicted
with the revert - see below) for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier"
Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module"
Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module"
Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file"
Created commit e668502: Revert "orinoco: Move hardware functions into separate file"
Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode"
Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables"
Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file"
Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

end of thread, other threads:[~2009-11-09 13:38 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-22  1:57 linux-next: wireless tree build failure Stephen Rothwell
2009-04-22  8:59 ` Johannes Berg
2009-04-22 13:03   ` Stephen Rothwell
2009-04-22 13:06     ` John W. Linville
2009-04-22 13:33       ` Johannes Berg
2009-04-22 13:36         ` Matthew Garrett
2009-06-03  2:52           ` Stephen Rothwell
2009-06-15 12:21             ` Stephen Rothwell
2009-04-22 13:11     ` Johannes Berg
2009-04-28  3:28 ` Stephen Rothwell
2009-04-28 12:50   ` John W. Linville
  -- strict thread matches above, loose matches on Subject: below --
2009-11-09  8:08 Stephen Rothwell
2009-11-09 13:37 ` Bartlomiej Zolnierkiewicz
     [not found] <20090505115455.0b147aeb.sfr@canb.auug.org.au>
2009-05-05  2:55 ` John W. Linville
2009-03-23  4:39 Stephen Rothwell
2009-03-23  4:53 ` David Miller
2009-03-23  5:01   ` Yang Hongyang
2009-03-23  4:55 ` David Miller
2009-03-23  5:06   ` Yang Hongyang
2009-03-23  5:48   ` Stephen Rothwell
2009-03-23  7:59     ` David Miller
2009-03-23  8:10       ` Stephen Rothwell
2009-02-27  2:44 Stephen Rothwell
2009-02-12  8:35 Stephen Rothwell
2009-02-12 16:16 ` John W. Linville
2009-02-12 22:07   ` Stephen Rothwell
2009-02-13 18:24   ` Dave
2009-02-13 18:24     ` John W. Linville

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).