chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/eeprom_9287.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/eeprom_9287.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/eeprom.h ('k') | chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/hif_usb.c » ('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/eeprom_9287.c

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

index 4a52cf03808b1aa207acb02fdd1f0394c38b73fa..dff2da777312bbb0e5b1c8902b370e79c41f75b4 100644

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

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

@@ -34,9 +34,14 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)

struct ar9287_eeprom *eep = &ah->eeprom.map9287;

struct ath_common *common = ath9k_hw_common(ah);

u16 *eep_data;

- int addr, eep_start_loc = AR9287_EEP_START_LOC;

+ int addr, eep_start_loc;

eep_data = (u16 *)eep;

+ if (ah->hw_version.devid == 0x7015)

+ eep_start_loc = AR9287_HTC_EEP_START_LOC;

+ else

+ eep_start_loc = AR9287_EEP_START_LOC;

if (!ath9k_hw_use_flash(ah)) {

ath_print(common, ATH_DBG_EEPROM,

"Reading from EEPROM, not flash\n");