chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/Kconfig ('k') | chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h » ('j') | chromeos/compat-wireless/net/mac80211/mlme.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c

diff --git a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c

index 50dda394f8bef01ee69fb3d3e88604e856f6b938..bd94b39bd8f7935818bfce73b282f7c88c8cd20a 100644

--- a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c

+++ b/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/ar9002_mac.c

@@ -229,13 +229,15 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,

if (ads->ds_txstatus1 & AR_FrmXmitOK)

ts->ts_status |= ATH9K_TX_ACKED;

- if (ads->ds_txstatus1 & AR_ExcessiveRetries)

- ts->ts_status |= ATH9K_TXERR_XRETRY;

- if (ads->ds_txstatus1 & AR_Filtered)

- ts->ts_status |= ATH9K_TXERR_FILT;

- if (ads->ds_txstatus1 & AR_FIFOUnderrun) {

- ts->ts_status |= ATH9K_TXERR_FIFO;

- ath9k_hw_updatetxtriglevel(ah, true);

+ else {

+ if (ads->ds_txstatus1 & AR_ExcessiveRetries)

+ ts->ts_status |= ATH9K_TXERR_XRETRY;

+ if (ads->ds_txstatus1 & AR_Filtered)

+ ts->ts_status |= ATH9K_TXERR_FILT;

+ if (ads->ds_txstatus1 & AR_FIFOUnderrun) {

+ ts->ts_status |= ATH9K_TXERR_FIFO;

+ ath9k_hw_updatetxtriglevel(ah, true);

+ }

}

if (ads->ds_txstatus9 & AR_TxOpExceeded)

ts->ts_status |= ATH9K_TXERR_XTXOP;