remove tracing patches
authorJohannes Berg <johannes@sipsolutions.net>
Sat, 30 Mar 2013 22:55:32 +0000 (23:55 +0100)
committerJohannes Berg <johannes@sipsolutions.net>
Sat, 30 Mar 2013 22:55:32 +0000 (23:55 +0100)
These are causing issues and it seems like the
current approach should work even without them.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/INFO [deleted file]
patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_mac80211_Makefile [deleted file]
patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_wireless_Makefile [deleted file]

diff --git a/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/INFO b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/INFO
deleted file mode 100644 (file)
index 461bdf0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Do not activate the mac80211 tracing for kernels <= 2.6.32
-
diff --git a/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_mac80211_Makefile b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_mac80211_Makefile
deleted file mode 100644 (file)
index abb5410..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/net/mac80211/Makefile
-+++ b/net/mac80211/Makefile
-@@ -25,7 +25,9 @@
-       wme.o \
-       event.o \
-       chan.o \
--      trace.o mlme.o
-+      mlme.o
-+
-+mac80211-$(CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER) += trace.o
- mac80211-$(CONFIG_MAC80211_LEDS) += led.o
- mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
diff --git a/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_wireless_Makefile b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing/net_wireless_Makefile
deleted file mode 100644 (file)
index 9b54295..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/net/wireless/Makefile
-+++ b/net/wireless/Makefile
-@@ -10,7 +10,8 @@
- obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
- cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
--cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o
-+cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o
-+cfg80211-$(CONFIG_COMPAT_CFG80211_DRIVER_API_TRACER) += trace.o
- cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
- cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
- cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o