From 0a7fc95522e2fa929cd6ff002ca98412cecbf714 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Tue, 11 Mar 2008 16:17:20 -0700 Subject: [PATCH] --- yaml --- r: 90183 b: refs/heads/master c: 35cdeaf4103b9a5c8a86899a5ed12a86c6a12a37 h: refs/heads/master i: 90181: 1d1d98bdf33e822deb604a025682506e1c28b06e 90179: 125537acca2d67a07962ea32a86e330463f22647 90175: d4d0d48ba39bda3e03fd47ec575f325623fa5382 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d0c71bd92f5e..ca4e38a18c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0310ae721d1b7aaf10dd8b712a3a83c355786970 +refs/heads/master: 35cdeaf4103b9a5c8a86899a5ed12a86c6a12a37 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index d84a7f296d90..b78ca7720bdf 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -5450,8 +5450,9 @@ static void iwl4965_init_hw_rates(struct iwl4965_priv *priv, /* * If CCK != 1M then set short preamble rate flag. */ - rates[i].flags |= (iwl4965_rates[i].plcp == 10) ? - 0 : IEEE80211_RATE_SHORT_PREAMBLE; + rates[i].flags |= + (iwl4965_rates[i].plcp == IWL_RATE_1M_PLCP) ? + 0 : IEEE80211_RATE_SHORT_PREAMBLE; } } }