2007-04-22 20:52:23

by Dick Marinus

[permalink] [raw]
Subject: Re: mac80211-7.0.4 ieee80211_ptr trouble

Op zaterdag 21-04-2007 om 22:23 uur [tijdzone +0200], schreef Johannes
Berg:
> No, you misunderstood me. The compat package includes a header file
that
> does these defines, but apparently you're missing it.

Ah, it seems ieee80211_ptr doesn't cause the problem, make unmodified
failed:
===
Checking kernel compatibility in:
/lib/modules/2.6.20-gentoo-r6/source//
* Kernel requires compatibility version:
- Requires net_device::ieee80211_ptr compat
- Requires class_dev -> dev API compat
- Requires to_net_dev API compat
- Requires device_rename compat
Building compatibility version in 'compatible/' directory:
Copying compatible/ from origin/...done
+ Applying: patches/ieee80211_ptr.patch
Re-use ax25_ptr in net_device for ieee80211_ptr
+ Running: ieee80211_ptr.sh
Type-cast reused void* ax25_ptr to struct wireless_dev *
+ Applying: patches/remove_debugfs.patch
Remove DEBUGFS usage (due to class_dev breakage)
+ Applying: patches/class_dev_to_dev-wireless-ieee80211_ptr.patch
Reverse class_dev to dev changes when ieee80211_ptr is used
+ Applying: patches/add_to_net_dev.patch
Add to_net_dev back in (newer kernels have it in netdevice.h)
-----patch failure output-----
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Add to_net_dev back in (newer kernels have it in netdevice.h)
|--- pre/net/mac80211/ieee80211_sysfs.c 2007-04-17 15:54:31.000000000
-0700
|+++ post/net/mac80211/ieee80211_sysfs.c 2007-04-17
15:55:57.000000000 -0700
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored

patches/add_to_net_dev.patch failed. Terminating.
If patch or script failed, check pre/ and post/ for current stage.
===
ieee80211_sysfs doesn't seem to exist in {pre,post}/net/mac80211/
neither in /usr/src/linux.

should it have been in the mac80211-7.0.4 tarball?

Thanks,

Dick



2007-04-23 19:33:17

by Dick

[permalink] [raw]
Subject: Re: mac80211-7.0.4 ieee80211_ptr trouble

Op maandag 23-04-2007 om 10:33 uur [tijdzone -0700], schreef James
Ketrenos:
> You can find it as mac80211-7.0.5.tgz at
> http://intellinuxwireless.org/?p=mac80211&n=downloads

Thanks a lot, it now compiles fine again!

greetings,
Dick


2007-04-23 17:33:29

by James Ketrenos

[permalink] [raw]
Subject: Re: mac80211-7.0.4 ieee80211_ptr trouble

Dick Marinus wrote:

> Ah, it seems ieee80211_ptr doesn't cause the problem, make unmodified
> failed:
...
> |--- pre/net/mac80211/ieee80211_sysfs.c 2007-04-17 15:54:31.000000000
...
> ieee80211_sysfs doesn't seem to exist in {pre,post}/net/mac80211/
> neither in /usr/src/linux.
>
> should it have been in the mac80211-7.0.4 tarball?

I see the problem now :)

ieee80211_sysfs.c is provided as part of Yi's pending/ patch to adding the sysfs attributes for QoS, and the add_net_dev patch is built against that code. I've checked in a new version of the mac80211 subsystem's build scripts that corrects for this behavior. I've build tested on 2.6.20-gentoo-r6 w/ both 'make patch_kernel' and 'make patch_kernel_unmodified' (which uses the unmodified (no 'pending' sources)

You can find it as mac80211-7.0.5.tgz at http://intellinuxwireless.org/?p=mac80211&n=downloads

Thanks,
James