diff options
| author | John W. Linville | 2011-04-07 22:45:40 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-04-07 22:45:40 +0200 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | cfg80211: add a timer for invalid user reg hints (diff) | |
| parent | ath: add missing regdomain pair 0x5c mapping (diff) | |
| download | kernel-qcow2-linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.tar.gz kernel-qcow2-linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.tar.xz kernel-qcow2-linux-b37e3b6d64358604960b35e8ecbb7aed22e0926e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index fb00464cead5..66f5fe8fe1ac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -503,6 +503,9 @@ static struct iwl_ht_params iwl5000_ht_params = { struct iwl_cfg iwl5300_agn_cfg = { .name = "Intel(R) Ultimate N WiFi Link 5300 AGN", IWL_DEVICE_5000, + /* at least EEPROM 0x11A has wrong info */ + .valid_tx_ant = ANT_ABC, /* .cfg overwrite */ + .valid_rx_ant = ANT_ABC, /* .cfg overwrite */ .ht_params = &iwl5000_ht_params, }; |