rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brcmsmac fixes from upstream (rhbz 892428)

This commit is contained in:
Justin M. Forbes 2013-01-23 10:20:08 -06:00
parent 79cfaf9c9a
commit dd35eb31a1
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
brcmsmac-updates-rhbz892428.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 426b9a9..d7ce1ac 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -361,7 +361,7 @@ static uint prevtxd(struct dma_info *di, uint i)
static uint nextrxd(struct dma_info *di, uint i)
{
- return txd(di, i + 1);
+ return rxd(di, i + 1);
}
static uint ntxdactive(struct dma_info *di, uint h, uint t)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 5710dc0..25c5410 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -232,8 +232,8 @@
#define MAX_DMA_SEGS 4
-/* Max # of entries in Tx FIFO based on 4kb page size */
-#define NTXD 256
+/* # of entries in Tx FIFO */
+#define NTXD 64
/* Max # of entries in Rx FIFO based on 4kb page size */
#define NRXD 256

13
kernel.spec
View File

@ -62,7 +62,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 203
%global baserelease 204
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -784,9 +784,12 @@ Patch21234: iwlegacy-fix-IBSS-cleanup.patch
#rhbz 902523
Patch21236: libata-replace-sata_settings-with-devslp_timing.patch
# i915 hang fixes
#i915 hang fixes
Patch21237: drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
#rhbz 892428
Patch21238: brcmsmac-updates-rhbz892428.patch
# END OF PATCH DEFINITIONS
%endif
@ -1506,6 +1509,9 @@ ApplyPatch libata-replace-sata_settings-with-devslp_timing.patch
#i915
ApplyPatch drm-invalidate-relocation-presumed_offsets-along-slow-patch.patch
#rhbz 892428
ApplyPatch brcmsmac-updates-rhbz892428.patch
# END OF PATCH APPLICATIONS
%endif
@ -2362,6 +2368,9 @@ fi
# ||----w |
# || ||
%changelog
* Wed Jan 23 2013 Justin M. Forbes <jforbes@redhat.com> - 3.7.4-204
- brcmsmac fixes from upstream (rhbz 892428)
* Wed Jan 23 2013 Dave Jones <davej@redhat.com>
- Remove warnings about empty IPI masks.