aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 887e4e3674cf..b53181324487 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -232,6 +232,21 @@ static struct iwl_ops iwl6000_ops = {
232 .led = &iwlagn_led_ops, 232 .led = &iwlagn_led_ops,
233}; 233};
234 234
235static struct iwl_hcmd_utils_ops iwl6050_hcmd_utils = {
236 .get_hcmd_size = iwl5000_get_hcmd_size,
237 .build_addsta_hcmd = iwl5000_build_addsta_hcmd,
238 .rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag,
239 .calc_rssi = iwl5000_calc_rssi,
240};
241
242static struct iwl_ops iwl6050_ops = {
243 .ucode = &iwl5000_ucode,
244 .lib = &iwl6000_lib,
245 .hcmd = &iwl5000_hcmd,
246 .utils = &iwl6050_hcmd_utils,
247 .led = &iwlagn_led_ops,
248};
249
235 250
236/* 251/*
237 * "h": Hybrid configuration, use both internal and external Power Amplifier 252 * "h": Hybrid configuration, use both internal and external Power Amplifier
@@ -397,7 +412,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
397 .ucode_api_max = IWL6050_UCODE_API_MAX, 412 .ucode_api_max = IWL6050_UCODE_API_MAX,
398 .ucode_api_min = IWL6050_UCODE_API_MIN, 413 .ucode_api_min = IWL6050_UCODE_API_MIN,
399 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, 414 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
400 .ops = &iwl6000_ops, 415 .ops = &iwl6050_ops,
401 .eeprom_size = OTP_LOW_IMAGE_SIZE, 416 .eeprom_size = OTP_LOW_IMAGE_SIZE,
402 .eeprom_ver = EEPROM_6050_EEPROM_VERSION, 417 .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
403 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, 418 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -423,7 +438,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
423 .ucode_api_max = IWL6050_UCODE_API_MAX, 438 .ucode_api_max = IWL6050_UCODE_API_MAX,
424 .ucode_api_min = IWL6050_UCODE_API_MIN, 439 .ucode_api_min = IWL6050_UCODE_API_MIN,
425 .sku = IWL_SKU_A|IWL_SKU_G, 440 .sku = IWL_SKU_A|IWL_SKU_G,
426 .ops = &iwl6000_ops, 441 .ops = &iwl6050_ops,
427 .eeprom_size = OTP_LOW_IMAGE_SIZE, 442 .eeprom_size = OTP_LOW_IMAGE_SIZE,
428 .eeprom_ver = EEPROM_6050_EEPROM_VERSION, 443 .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
429 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, 444 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -474,7 +489,7 @@ struct iwl_cfg iwl6050_3agn_cfg = {
474 .ucode_api_max = IWL6050_UCODE_API_MAX, 489 .ucode_api_max = IWL6050_UCODE_API_MAX,
475 .ucode_api_min = IWL6050_UCODE_API_MIN, 490 .ucode_api_min = IWL6050_UCODE_API_MIN,
476 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, 491 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
477 .ops = &iwl6000_ops, 492 .ops = &iwl6050_ops,
478 .eeprom_size = OTP_LOW_IMAGE_SIZE, 493 .eeprom_size = OTP_LOW_IMAGE_SIZE,
479 .eeprom_ver = EEPROM_6050_EEPROM_VERSION, 494 .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
480 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, 495 .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,