Commit Graph

55 Commits

Author SHA1 Message Date
Larry Finger a504de3a1e staging: rtl8192e: Fix array overrun
Smatch outputs the following message:

drivers/staging/rtl8192e/r8192E_cmdpkt.c +412 cmpk_message_handle_rx(70)
	error: buffer overflow 'priv->stats.rxcmdpkt' 4 <= 7

   407                          RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
   408                                   "unknow CMD Element\n");
   409                          return 1;
   410                  }
   411
   412                  priv->stats.rxcmdpkt[element_id]++;
                                             ^^^^^^^^^^
->stats.rxcmdpkt[] only has 4 elements, but from the switch statement
in the section before we can see that element_id can go up to 7
(RX_TX_RATE_HISTORY).

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-29 10:58:00 -07:00
Larry Finger 49aab5fd9d staging: rtl8192e: Fix sparse (non-endian) warnings - Part II
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 15:36:35 -07:00
Larry Finger 1344ee2591 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger 0dd565069b staging: rtl8192e: Modify time handling
In several places, the driver keeps times (in jiffies) in two 32-bit
quantities. In the rtl8192_hw_to_sleep(), there is an error in the
calculation of the difference between two 64-bit quantities. Rather
than fix that error, I have converted to a single 64-bit number. That
makes the code be much cleaner and clearer.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:09 -07:00
Larry Finger 9de9f962c7 staging: rtl8192e: Convert typedefs that can be replaced with #define
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:55:49 -05:00
Larry Finger de7c885a24 staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:04 -05:00
Larry Finger dc20a3265e staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:58 -05:00
Larry Finger ebc95dd01c staging: rtl8192e: Convert typedef TWO_PORT_STATUS to enum two_port_status
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:38 -05:00
Larry Finger 2f4178151a staging: rtl8192e: Convert typedef PCI_BRIDGE_VENDOR to enum pci_bridge_vendor
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:38 -05:00
Larry Finger 456419dbb3 staging: rtl8192e: Convert typedef IC_INFERIORITY_8192S to enum ic_inferiority_8192s
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:37 -05:00
Larry Finger ab0d7ccaf7 staging: rtl8192e: Convert typedef RESET_TYPE to enum reset_type
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:36 -05:00
Larry Finger ed8eac2f92 staging: rtl8192e: Convert typedef RT_CUSTOMER_ID to enum rt_customer_id
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:35 -05:00
Larry Finger 0fd4442586 staging: rtl8192e: Convert typedef RT_STATUS to enum rt_status
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:33 -05:00
Larry Finger 6f44d2bdfc staging: rtl8192e: Convert typedef RF_STEP_E to enum rf_step
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:33 -05:00
Larry Finger fc6094f670 staging: rtl8192e: Convert typedef RT_RF_TYPE_819xU to enum rt_rf_type_819xu
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:32 -05:00
Larry Finger aec1148c5b staging: rtl8192e: Convert typedef DCMD_TXCMD_OP to enum dcmg_txcmd_op
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:31 -05:00
Larry Finger e9463775ed staging: rtl8192e: Convert typedef RT_EEPROM_TYPE to enum rt_eeprom_type
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:30 -05:00
Larry Finger b55941afbf staging: rtl8192e: Convert typedef nic_t to enum nic_t
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:28 -05:00
Larry Finger 379a20fb29 staging: rtl8192e: Convert typedef ACM_METHOD to enum acm_method
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:26 -05:00
Larry Finger 6e579119b1 staging: rtl8192e: Convert typedef HT_CHANNEL_WIDTH to enum ht_channel_width
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:49:01 -05:00
Larry Finger 9659e7f527 staging: rtl8192e: Convert typedef firmware_source_e to enum firmware_source
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:47:03 -05:00
Larry Finger 70f9f79c48 staging: rtl8192e: Convert typedef rtl819x_loopback_e to enum rtl819x_loopback
Remove typedef from enum.
Rename enum.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:31:21 -05:00
Larry Finger d3b2c17251 staging: rtl8192e: Prepare header files to ease use of typedef enum conversion
The tool that I am using fails for certain conditions. This patch makes trivial
changes to the source to allow the tool to work for all cases.

I also remove some artifacts left from the typedef struct conversion.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:23:46 -05:00
Larry Finger edc4b2c570 staging: rtl8192e: Convert delayed_work_struct_rsl to struct delayed_work and work_struct_rsl to struct work_struct
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:53:26 -05:00
Larry Finger fc22c052e2 staging: rtl8192e: Convert typedef buffer to struct buffer
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:52:53 -05:00
Larry Finger e3e3762996 staging: rtl8192e: Convert typedef r8192_priv to struct r8192_priv
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:52:26 -05:00
Larry Finger 2fac6fc46d staging: rtl8192e: Convert typedef Stats to struct rt_stats
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:52:01 -05:00
Larry Finger 1897a50c8f staging: rtl8192e: Convert typedef mp_adapter to struct mp_adapter
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:44:33 -05:00
Larry Finger 9be6f10ed3 staging: rtl8192e: Convert typedef rate_adaptive to struct rate_adaptive
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:43:59 -05:00
Larry Finger 3b83db43cc staging: rtl8192e: Convert typedef cb_desc to struct cb_desc
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:42:49 -05:00
Larry Finger 43267fef10 staging: rtl8192e: Convert typedef init_gain to struct init_gain
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:42:23 -05:00
Larry Finger d514e3452a staging: rtl8192e: Convert typedef ccktxbbgain_struct to struct ccktxbbgain
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:39:35 -05:00
Larry Finger b7a14040da staging: rtl8192e: Convert typedef tx_ring to struct tx_ring
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:39:09 -05:00
Larry Finger 031189ec76 staging: rtl8192e: Convert typedef txbbgain_struct to struct txbbgain_struct
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:38:42 -05:00
Larry Finger ebbef649f9 staging: rtl8192e: Convert typedef rtl_reg_debug to struct rtl_reg_debug
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:38:15 -05:00
Larry Finger 5aca114d91 staging: rtl8192e: Convert typedef rt_firmware to struct rt_firmware
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:37:28 -05:00
Larry Finger 4f534b36af staging: rtl8192e: Convert typedef rx_desc to struct rx_desc
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:29:25 -05:00
Larry Finger 3215312bc2 staging: rtl8192e: Convert typedef tx_desc_cmd to struct tx_desc_cmd
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:29:00 -05:00
Larry Finger 9c10985632 staging: rtl8192e: Convert typedef rt_tx_rahis_t to struct rt_tx_rahis
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:27:41 -05:00
Larry Finger e91dbf0301 staging: rtl8192e: Convert typedef CHANNEL_ACCESS_SETTING to struct channel_access_setting
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:27:13 -05:00
Larry Finger bc27e89b27 staging: rtl8192e: Convert typedef tx_desc to struct tx_desc
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:26:38 -05:00
Larry Finger 9d94bbb8c8 staging: rtl8192e: Convert typedef RT_SMOOTH_DATA_4RF to struct rt_smooth_data_4rf
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:19:52 -05:00
Larry Finger c13ac63b60 staging: rtl8192e: Convert typedef LOG_INTERRUPT_8190_T to struct log_int_8190
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:08:50 -05:00
Larry Finger 9bf6e4c146 staging: rtl8192e: Convert typedef BB_REGISTER_DEFINITION_T to struct bb_reg_definition
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 01:06:56 -05:00
Larry Finger 38b1f67d9d staging: rtl8192e: Convert typedef FALSE_ALARM_STATISTICS to struct false_alarm_stats
Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 00:56:36 -05:00
Larry Finger f60949901c staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:39:21 -05:00
Larry Finger c9d9a8016d staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:33:27 -05:00
Larry Finger d22a336469 staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:32:51 -05:00
Larry Finger 5c9e4285b5 staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:24:51 -05:00
Larry Finger c29fed1e5c staging: rtl8192e: Remove dead code associated with CONFIG_BT_30
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:18:58 -05:00