From e082c03a46209d7ac222a7a52c2b61386ccfd17e Mon Sep 17 00:00:00 2001 From: Ben Cahill Date: Fri, 5 Feb 2010 11:33:47 -0800 Subject: [PATCH] --- yaml --- r: 184079 b: refs/heads/master c: ed56a3f15a0561e900957ecca0dee42b9b453a9e h: refs/heads/master i: 184077: 7e8a6e4b4a848b8ea6466df174e350c9ce110006 184075: 2c35e495c753c02f4d8ba6d6a5f07fffa0bfc14c 184071: d165297dc8435c6522b56d1e1e0a0666b759a28f 184063: a0d35beec6f60933992bc592c723d0364697f4d7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 53f545895207..281a470d3e84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4fe5ac9e04e6e175a7bd7e29844b351533be591 +refs/heads/master: ed56a3f15a0561e900957ecca0dee42b9b453a9e diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-6000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-6000.c index 17198253b0bc..782e23a26984 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-6000.c @@ -277,21 +277,6 @@ static const struct iwl_ops iwl6000_ops = { .led = &iwlagn_led_ops, }; -static struct iwl_hcmd_utils_ops iwl6050_hcmd_utils = { - .get_hcmd_size = iwl5000_get_hcmd_size, - .build_addsta_hcmd = iwl5000_build_addsta_hcmd, - .rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag, - .calc_rssi = iwl5000_calc_rssi, -}; - -static const struct iwl_ops iwl6050_ops = { - .ucode = &iwl5000_ucode, - .lib = &iwl6000_lib, - .hcmd = &iwl5000_hcmd, - .utils = &iwl6050_hcmd_utils, - .led = &iwlagn_led_ops, -}; - /* * "i": Internal configuration, use internal Power Amplifier */ @@ -395,7 +380,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { .ucode_api_max = IWL6050_UCODE_API_MAX, .ucode_api_min = IWL6050_UCODE_API_MIN, .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, - .ops = &iwl6050_ops, + .ops = &iwl6000_ops, .eeprom_size = OTP_LOW_IMAGE_SIZE, .eeprom_ver = EEPROM_6050_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, @@ -427,7 +412,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { .ucode_api_max = IWL6050_UCODE_API_MAX, .ucode_api_min = IWL6050_UCODE_API_MIN, .sku = IWL_SKU_A|IWL_SKU_G, - .ops = &iwl6050_ops, + .ops = &iwl6000_ops, .eeprom_size = OTP_LOW_IMAGE_SIZE, .eeprom_ver = EEPROM_6050_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,