diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-05 16:09:49 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-05 16:09:49 -0500 |
commit | 208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch) | |
tree | 0cf4e87e7877bff42d1f3b480c2d585347ee3eba /ath9k-rx-dma-stop-check.patch | |
parent | bfe354a1c3609cdd83fd0647153365ff4f81701f (diff) | |
download | kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip |
Linux v3.19-rc2
- Temporarily disable aarch64patches
- Happy New Year
Diffstat (limited to 'ath9k-rx-dma-stop-check.patch')
-rw-r--r-- | ath9k-rx-dma-stop-check.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch index c1034a057..7613691bb 100644 --- a/ath9k-rx-dma-stop-check.patch +++ b/ath9k-rx-dma-stop-check.patch @@ -7,10 +7,10 @@ Subject: [PATCH] ath9k: rx dma stop check 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c -index 275205ab5f15..bb842623bdf6 100644 +index 3e58bfa0c1fd..406eea47256e 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) +@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) { #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ struct ath_common *common = ath9k_hw_common(ah); @@ -19,7 +19,7 @@ index 275205ab5f15..bb842623bdf6 100644 int i; /* Enable access to the DMA observation bus */ -@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) +@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) } if (i == 0) { |