diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-13 14:40:59 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-13 14:40:59 -0500 |
| commit | f13352519ee8c4b22b87fc1a47743d1f53ea193e (patch) | |
| tree | 48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/ath/carl9170 | |
| parent | 559c33d84da71e07816e692bfd73ad92675256a6 (diff) | |
| parent | 26b0e411d37a2ca5992d02884dc3fa4e1907e598 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath/carl9170')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 4c3f576c3144..4c8cdb097b65 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c | |||
| @@ -1967,18 +1967,6 @@ static int carl9170_parse_eeprom(struct ar9170 *ar) | |||
| 1967 | return -ENOMEM; | 1967 | return -ENOMEM; |
| 1968 | ar->num_channels = chans; | 1968 | ar->num_channels = chans; |
| 1969 | 1969 | ||
| 1970 | /* | ||
| 1971 | * I measured this, a bandswitch takes roughly | ||
| 1972 | * 135 ms and a frequency switch about 80. | ||
| 1973 | * | ||
| 1974 | * FIXME: measure these values again once EEPROM settings | ||
| 1975 | * are used, that will influence them! | ||
| 1976 | */ | ||
| 1977 | if (bands == 2) | ||
| 1978 | ar->hw->channel_change_time = 135 * 1000; | ||
| 1979 | else | ||
| 1980 | ar->hw->channel_change_time = 80 * 1000; | ||
| 1981 | |||
| 1982 | regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]); | 1970 | regulatory->current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]); |
| 1983 | 1971 | ||
| 1984 | /* second part of wiphy init */ | 1972 | /* second part of wiphy init */ |