summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-17 13:28:42 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-17 13:34:28 -0400
commit6a06c8fd768fe7ff6f078fafb57014073cf17d6f (patch)
treec9c7567c5faf07e18034be93fed8242b655091c7
parent819694721b1678e81cf1e968ce686719c361c346 (diff)
downloadkernel-6a06c8fd768fe7ff6f078fafb57014073cf17d6f.tar.gz
kernel-6a06c8fd768fe7ff6f078fafb57014073cf17d6f.tar.xz
kernel-6a06c8fd768fe7ff6f078fafb57014073cf17d6f.zip
Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)
Also build fq_codel network scheduler in
-rw-r--r--config-generic4
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 11293a8b3..7f21d3e0f 100644
--- a/config-generic
+++ b/config-generic
@@ -1166,7 +1166,7 @@ CONFIG_NET_SCH_MULTIQ=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=y
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
@@ -1703,7 +1703,7 @@ CONFIG_B43_DEBUG=y
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_HT=y
-# CONFIG_B43_PHY_G is not set
+CONFIG_B43_PHY_G=y
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
diff --git a/kernel.spec b/kernel.spec
index f83f7fc50..460714ba8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2202,6 +2202,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Oct 17 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)
+
* Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.3
- Revert Btrfs ro snapshot commit that causes filesystem corruption