diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-21 02:47:07 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-21 02:47:07 +0200 |
| commit | 828d7d7b19446bf5a40928da47955c575a454c75 (patch) | |
| tree | fd006445c562749de9a07fe6e5363bab5d285a20 /drivers/net/wireless/iwlegacy/iwl-eeprom.c | |
| parent | Bluetooth: Fix lockdep warning in L2CAP (diff) | |
| parent | iwl4965: fix skb usage after free (diff) | |
| download | linux-828d7d7b19446bf5a40928da47955c575a454c75.tar.xz linux-828d7d7b19446bf5a40928da47955c575a454c75.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-eeprom.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-eeprom.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c index 04c5648027df..cb346d1a9ffa 100644 --- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c +++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c @@ -471,13 +471,6 @@ int iwl_legacy_init_channel_map(struct iwl_priv *priv) flags & EEPROM_CHANNEL_RADAR)) ? "" : "not "); - /* Set the tx_power_user_lmt to the highest power - * supported by any channel */ - if (eeprom_ch_info[ch].max_power_avg > - priv->tx_power_user_lmt) - priv->tx_power_user_lmt = - eeprom_ch_info[ch].max_power_avg; - ch_info++; } } |