chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/htc_drv_main.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/htc_drv_main.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: Created 10 years, 1 month 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/htc_drv_init.c ('k') | chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c » ('j') | chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/rc.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ebed9d1691a5110ee3222ab12e652da4dcdde9d5..7d09b4b17bbd4b5e1146fa295ea6a22ffb571014 100644

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

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

@@ -366,7 +366,8 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,

caps = WLAN_RC_HT_FLAG;

if (sta->ht_cap.mcs.rx_mask[1])

caps |= WLAN_RC_DS_FLAG;

- if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)

+ if ((sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&

+ (conf_is_ht40(&priv->hw->conf)))

caps |= WLAN_RC_40_FLAG;

if (conf_is_ht40(&priv->hw->conf) &&

(sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40))