summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-09 10:24:35 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-09 10:24:35 -0500
commit3a3b49403f37240b57359154a975bbde22af3ddd (patch)
treebaeea04b78201035dbf27b1616d9ad9af5d55355
parentdc99927b4ebfc11de642b7c5d74125ddd2f5faf4 (diff)
downloadkernel-3a3b49403f37240b57359154a975bbde22af3ddd.tar.gz
kernel-3a3b49403f37240b57359154a975bbde22af3ddd.tar.xz
kernel-3a3b49403f37240b57359154a975bbde22af3ddd.zip
Do a better job of cleaning-up compat-wireless between builds
-rw-r--r--compat-wireless-ath9k-rate-control-fixup.patch16
-rw-r--r--kernel.spec6
2 files changed, 22 insertions, 0 deletions
diff --git a/compat-wireless-ath9k-rate-control-fixup.patch b/compat-wireless-ath9k-rate-control-fixup.patch
new file mode 100644
index 000000000..b11cf2a2f
--- /dev/null
+++ b/compat-wireless-ath9k-rate-control-fixup.patch
@@ -0,0 +1,16 @@
+diff -up compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c.orig compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c
+--- compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c.orig 2011-12-09 10:08:18.951768673 -0500
++++ compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c 2011-12-09 10:08:38.224527731 -0500
+@@ -1615,6 +1615,7 @@ static struct rate_control_ops ath_rate_
+ #endif
+ };
+
++#ifdef CONFIG_ATH9K_RATE_CONTROL
+ int ath_rate_control_register(void)
+ {
+ return ieee80211_rate_control_register(&ath_rate_ops);
+@@ -1624,3 +1625,4 @@ void ath_rate_control_unregister(void)
+ {
+ ieee80211_rate_control_unregister(&ath_rate_ops);
+ }
++#endif
diff --git a/kernel.spec b/kernel.spec
index 7a59310c0..64e1c4c43 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1474,6 +1474,9 @@ cd ..
%if %{with_backports}
+# Always start fresh
+rm -rf compat-wireless-%{cwversion}
+
# Extract the compat-wireless bits
%setup -q -n kernel-%{kversion}%{?dist} -T -D -a 1
@@ -2225,6 +2228,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Dec 09 2011 John W. Linville <linville@redhat.com>
+- Do a better job of cleaning-up compat-wireless between builds
+
* Fri Dec 09 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc4.git6.1
- Linux 3.2-rc4-git6 (09d9673d53005fdf40de4c759425893904292236)