From 4248ea2b88864c2ec976a3b6c7e969d24162063d Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 5 Dec 2007 20:59:59 +0200 Subject: [PATCH] --- yaml --- r: 79100 b: refs/heads/master c: bb54244be7d12c2a5985226061d598edb49c9078 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.h | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87324d9aa019..82f67d67fafb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd1f8414664b3e834aa46cdbf8f0c12fc42a878 +refs/heads/master: bb54244be7d12c2a5985226061d598edb49c9078 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h index 5a410e284b95..267ae75254fe 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h @@ -516,7 +516,7 @@ struct iwl_ht_info { u8 supported_chan_width; u16 tx_mimo_ps_mode; u8 is_green_field; - u8 sgf; + u8 sgf; /* HT_SHORT_GI_* short guard interval */ u8 max_amsdu_size; u8 ampdu_factor; u8 mpdu_density; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7550594ed4fc..14a1124e6ef4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -350,7 +350,7 @@ int iwl4965_tx_queue_init(struct iwl4965_priv *priv, * For the command queue (#4), allocate command space + one big * command for scan, since scan command is very huge; the system will * not have two scans at the same time, so only one is needed. - * For data Tx queues (all other queues), no super-size command + * For normal Tx queues (all other queues), no super-size command * space is needed. */ len = sizeof(struct iwl4965_cmd) * slots_num;