diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 17198253b0bc..782e23a26984 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -277,21 +277,6 @@ static const struct iwl_ops iwl6000_ops = { | |||
277 | .led = &iwlagn_led_ops, | 277 | .led = &iwlagn_led_ops, |
278 | }; | 278 | }; |
279 | 279 | ||
280 | static struct iwl_hcmd_utils_ops iwl6050_hcmd_utils = { | ||
281 | .get_hcmd_size = iwl5000_get_hcmd_size, | ||
282 | .build_addsta_hcmd = iwl5000_build_addsta_hcmd, | ||
283 | .rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag, | ||
284 | .calc_rssi = iwl5000_calc_rssi, | ||
285 | }; | ||
286 | |||
287 | static const struct iwl_ops iwl6050_ops = { | ||
288 | .ucode = &iwl5000_ucode, | ||
289 | .lib = &iwl6000_lib, | ||
290 | .hcmd = &iwl5000_hcmd, | ||
291 | .utils = &iwl6050_hcmd_utils, | ||
292 | .led = &iwlagn_led_ops, | ||
293 | }; | ||
294 | |||
295 | /* | 280 | /* |
296 | * "i": Internal configuration, use internal Power Amplifier | 281 | * "i": Internal configuration, use internal Power Amplifier |
297 | */ | 282 | */ |
@@ -395,7 +380,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { | |||
395 | .ucode_api_max = IWL6050_UCODE_API_MAX, | 380 | .ucode_api_max = IWL6050_UCODE_API_MAX, |
396 | .ucode_api_min = IWL6050_UCODE_API_MIN, | 381 | .ucode_api_min = IWL6050_UCODE_API_MIN, |
397 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 382 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
398 | .ops = &iwl6050_ops, | 383 | .ops = &iwl6000_ops, |
399 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 384 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
400 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, | 385 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, |
401 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 386 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
@@ -427,7 +412,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { | |||
427 | .ucode_api_max = IWL6050_UCODE_API_MAX, | 412 | .ucode_api_max = IWL6050_UCODE_API_MAX, |
428 | .ucode_api_min = IWL6050_UCODE_API_MIN, | 413 | .ucode_api_min = IWL6050_UCODE_API_MIN, |
429 | .sku = IWL_SKU_A|IWL_SKU_G, | 414 | .sku = IWL_SKU_A|IWL_SKU_G, |
430 | .ops = &iwl6050_ops, | 415 | .ops = &iwl6000_ops, |
431 | .eeprom_size = OTP_LOW_IMAGE_SIZE, | 416 | .eeprom_size = OTP_LOW_IMAGE_SIZE, |
432 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, | 417 | .eeprom_ver = EEPROM_6050_EEPROM_VERSION, |
433 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 418 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |