[kernel/f18] brcmsmac fixes from upstream (rhbz 892428)

[Justin M. Forbes]

commit dd35eb31a1c81eabe3b59c84590982791b0807f4
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Wed Jan 23 10:20:08 2013 -0600

    brcmsmac fixes from upstream (rhbz 892428)

 brcmsmac-updates-rhbz892428.patch |   28 ++++++++++++++++++++++++++++
 kernel.spec                       |   13 +++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/brcmsmac-updates-rhbz892428.patch b/brcmsmac-updates-rhbz892428.patch
new file mode 100644
index 0000000..8b5e08f
--- /dev/null
+++ b/brcmsmac-updates-rhbz892428.patch
@@ -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
+
diff --git a/kernel.spec b/kernel.spec
index d62adf1..a7cfae9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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 at redhat.com> - 3.7.4-204
+- brcmsmac fixes from upstream (rhbz 892428)
+
 * Wed Jan 23 2013 Dave Jones <davej at redhat.com>
 - Remove warnings about empty IPI masks.