summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-07 12:30:59 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-07 12:33:04 -0500
commit44ef27d0d05713408d7afbf1155d53b24bacc69c (patch)
tree23b0ecdeaa278d8d5a9a070a2fdbfd775ab5a216 /kernel.spec
parentdee356203f1ec66053a89024b7ea6370814d67b9 (diff)
downloadkernel-44ef27d0d05713408d7afbf1155d53b24bacc69c.tar.gz
kernel-44ef27d0d05713408d7afbf1155d53b24bacc69c.tar.xz
kernel-44ef27d0d05713408d7afbf1155d53b24bacc69c.zip
Add two patches to fix mac80211 issues (rhbz 731365)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 97f502436..2d8e8a972 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -700,6 +700,10 @@ Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
#rhbz 749166
Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
+#rhbz 731365
+Patch21062: mac80211-fix-remain_off_channel-regression.patch
+Patch21063: mac80211-config-hw-when-going-back-on-channel.patch
+
Patch21070: oom-fix-integer-overflow-of-points.patch
Patch21071: modsplit-post-merge.patch
@@ -1327,6 +1331,10 @@ ApplyPatch oom-fix-integer-overflow-of-points.patch
ApplyPatch modsplit-post-merge.patch
+#rhbz 731365
+ApplyPatch mac80211-fix-remain_off_channel-regression.patch
+ApplyPatch mac80211-config-hw-when-going-back-on-channel.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2034,6 +2042,7 @@ fi
- Linux 3.1-git7
- Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)
- Add fixes from git://openlinux.windriver.com/people/paulg/modsplit-post-merge
+- Add two patches to fix mac80211 issues (rhbz 731365)
* Fri Nov 04 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-git6