On Sun, Jun 7, 2009 at 11:12 PM, Julian Calaby<julian.calaby@xxxxxxxxx> wrote: > On Mon, Jun 8, 2009 at 16:02, Julian Calaby<julian.calaby@xxxxxxxxx> wrote: >> Update to match wireless-testing v2.6.30-rc8-25759-g00f7164 >> >> Signed-off-by: Julian Calaby <julian.calaby@xxxxxxxxx> >> --- >> compat/compat.diff | 42 +++++++++++++++++++++++------------------- >> 1 files changed, 23 insertions(+), 19 deletions(-) >> >> diff --git a/compat/compat.diff b/compat/compat.diff >> index d89ea98..846e8f5 100644 >> --- a/compat/compat.diff >> +++ b/compat/compat.diff >> @@ -181,6 +181,12 @@ >> obj-$(CONFIG_LIBERTAS) += libertas/ >> >> obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ >> +@@ -60,5 +34,3 @@ >> + obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o >> + >> + obj-$(CONFIG_WL12XX) += wl12xx/ >> +- >> +-obj-$(CONFIG_IWM) += iwmc3200wifi/ > > Sigh. > > Of course, I forgot to describe the changes in this patch. > > compat.diff has been updated to apply cleanly over the > wireless-testing.git version specified above with no fuzz. > > iwmc3200wifi, as I don't know if it compiles on anything but > wireless-testing.git, has been disabled by editing it out of the > Makefile as it's directory isn't actually copied from > wireless-testing. -- I'm not sure that this is the correct way to do > this as it's hiding the problem away in compat.diff - not obviously > fixing it by, e.g. copying the directory from wireless-testing.git or > making it compile on older kernels. This is fine for now. > I must note that even after these changes, this still doesn't actually > compile for me, as ath9k uses the rfkill_ops structure which isn't > present in my 2.6.29 kernel. Thanks for the note, both patches applied. For rfkill we'll need someone brave and with time to backport it... as rfkill has been re-written. The easiest solution is to revert the patches for older kernels through compat.diff. That is add #ifdefs and for old kernel revisions use the old stuff, for new kernels (as of 2.6.31) leave the code in place. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
