From 471b47c6c40f14491d0820670f9c07af888ad6bb Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 4 Aug 2009 13:40:09 -0700 Subject: [PATCH] Move compat-wireless specific changes to 98-add-compat-wireless.patch Changes which add support for compat.h and compat-2.6.* are put into its own patch file. We use 98 as its the second to last expect patch. The 99 patch will be the one that deals with the Makefiles to only enable the modules we want to compile. Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 24 ----------------------- compat/diffs/98-add-compat-wireless.patch | 24 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 compat/diffs/98-add-compat-wireless.patch diff --git a/compat/compat.diff b/compat/compat.diff index 65ebc4e0ec83..9b0ac408bb93 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -33,30 +33,6 @@ -obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o -obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o ---- a/net/wireless/Makefile -+++ b/net/wireless/Makefile -@@ -10,3 +10,11 @@ cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o - cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o wext-sme.o - - ccflags-y += -D__CHECK_ENDIAN__ -+# Compat-wireless kernel compatibility code -+cfg80211-y += compat-2.6.27.o -+cfg80211-y += compat-2.6.28.o -+cfg80211-y += compat-2.6.29.o -+cfg80211-y += compat-2.6.30.o -+cfg80211-y += compat-2.6.31.o -+cfg80211-y += compat-2.6.32.o -+ ---- a/include/net/cfg80211.h -+++ b/include/net/cfg80211.h -@@ -23,6 +23,7 @@ - /* remove once we remove the wext stuff */ - #include - #include -+#include - - - /* --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -22,7 +22,7 @@ struct rate_control_alg { diff --git a/compat/diffs/98-add-compat-wireless.patch b/compat/diffs/98-add-compat-wireless.patch new file mode 100644 index 000000000000..7309fcf5531f --- /dev/null +++ b/compat/diffs/98-add-compat-wireless.patch @@ -0,0 +1,24 @@ +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -10,3 +10,11 @@ cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o + cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o wext-sme.o + + ccflags-y += -D__CHECK_ENDIAN__ ++# Compat-wireless kernel compatibility code ++cfg80211-y += compat-2.6.27.o ++cfg80211-y += compat-2.6.28.o ++cfg80211-y += compat-2.6.29.o ++cfg80211-y += compat-2.6.30.o ++cfg80211-y += compat-2.6.31.o ++cfg80211-y += compat-2.6.32.o ++ +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -23,6 +23,7 @@ + /* remove once we remove the wext stuff */ + #include + #include ++#include + + + /* -- 2.30.2