mwifiex: scan: replace pointer arithmetic with array access (948ad6b3) · Commits · 戴 / test

drivers/net/wireless/marvell/mwifiex/scan.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -1055,27 +1055,24 @@ mwifiex_config_scan(struct mwifiex_private *priv,
		chan_idx++) {

		channel = user_scan_in->chan_list[chan_idx].chan_number;
		(scan_chan_list + chan_idx)->chan_number = channel;
		scan_chan_list[chan_idx].chan_number = channel;

		radio_type =
		user_scan_in->chan_list[chan_idx].radio_type;
		(scan_chan_list + chan_idx)->radio_type = radio_type;
		scan_chan_list[chan_idx].radio_type = radio_type;

		scan_type = user_scan_in->chan_list[chan_idx].scan_type;

		if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
		(scan_chan_list +
		chan_idx)->chan_scan_mode_bitmap
		scan_chan_list[chan_idx].chan_scan_mode_bitmap
		\|= (MWIFIEX_PASSIVE_SCAN \|
		MWIFIEX_HIDDEN_SSID_REPORT);
		else
		(scan_chan_list +
		chan_idx)->chan_scan_mode_bitmap
		scan_chan_list[chan_idx].chan_scan_mode_bitmap
		&= ~MWIFIEX_PASSIVE_SCAN;

		if (*filtered_scan)
		(scan_chan_list +
		chan_idx)->chan_scan_mode_bitmap
		scan_chan_list[chan_idx].chan_scan_mode_bitmap
		\|= MWIFIEX_DISABLE_CHAN_FILT;

		if (user_scan_in->chan_list[chan_idx].scan_time) {
		@@ -1090,9 +1087,9 @@ mwifiex_config_scan(struct mwifiex_private *priv,
		scan_dur = adapter->active_scan_time;
		}

		(scan_chan_list + chan_idx)->min_scan_time =
		scan_chan_list[chan_idx].min_scan_time =
		cpu_to_le16(scan_dur);
		(scan_chan_list + chan_idx)->max_scan_time =
		scan_chan_list[chan_idx].max_scan_time =
		cpu_to_le16(scan_dur);
		}