From 1eff6f19ce81a161ad38bf293fd464d62cb5c0b2 Mon Sep 17 00:00:00 2001 From: Gregory Greenman Date: Mon, 30 Jun 2008 17:23:01 +0800 Subject: [PATCH] --- yaml --- r: 103271 b: refs/heads/master c: 853554accce19d16b03476676bdcb1ccdd44caae h: refs/heads/master i: 103269: 786de97420fde6b72668cf50feba4b33d481bac1 103267: 02272f6e0b81be51d549b486094701bdec841c19 103263: 2ef90a685b400bb003763ce92493d79595480b9b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-commands.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51897ac66225..09583cdbed73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc19d6e0b74ef03a3baf035412c95192b54dfc6f +refs/heads/master: 853554accce19d16b03476676bdcb1ccdd44caae diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c index 438c3812c390..2b48f1b19140 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -1426,7 +1426,7 @@ static int iwl5000_send_tx_power(struct iwl_priv *priv) /* half dBm need to multiply */ tx_power_cmd.global_lmt = (s8)(2 * priv->tx_power_user_lmt); - tx_power_cmd.flags = 0; + tx_power_cmd.flags = IWL50_TX_POWER_NO_CLOSED; tx_power_cmd.srv_chan_lmt = IWL50_TX_POWER_AUTO; return iwl_send_cmd_pdu_async(priv, REPLY_TX_POWER_DBM_CMD, sizeof(tx_power_cmd), &tx_power_cmd, diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h b/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h index 920dfc1b2db2..6957b2208240 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h @@ -336,6 +336,8 @@ struct iwl4965_tx_power_db { * struct iwl5000_tx_power_dbm_cmd */ #define IWL50_TX_POWER_AUTO 0x7f +#define IWL50_TX_POWER_NO_CLOSED (0x1 << 6) + struct iwl5000_tx_power_dbm_cmd { s8 global_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */ u8 flags;