Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a421b91 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: move scan to iwl-scan.c iwlcore 



This patch moves scan code to iwl-scan.c file in iwlcore module.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4564ce8b

drivers/net/wireless/iwlwifi/Makefile

+3 −2
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_IWLCORE)	+= iwlcore.o

obj-$(CONFIG_IWLCORE)	+= iwlcore.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o iwl-calib.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o iwl-calib.o

iwlcore-objs 		+= iwl-scan.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o

iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o

drivers/net/wireless/iwlwifi/iwl-commands.h

+12 −12
Original line number Original line Diff line number Diff line
@@ -2100,7 +2100,7 @@ struct iwl4965_ct_kill_config { 
 *****************************************************************************/

 *****************************************************************************/





/**

/**

 * struct iwl4965_scan_channel - entry in REPLY_SCAN_CMD channel table

 * struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table

 *

 *

 * One for each channel in the scan list.

 * One for each channel in the scan list.

 * Each channel can independently select:

 * Each channel can independently select:
@@ -2110,7 +2110,7 @@ struct iwl4965_ct_kill_config { 
 *     quiet_plcp_th, good_CRC_th)

 *     quiet_plcp_th, good_CRC_th)

 *

 *

 * To avoid uCode errors, make sure the following are true (see comments

 * To avoid uCode errors, make sure the following are true (see comments

 * under struct iwl4965_scan_cmd about max_out_time and quiet_time):

 * under struct iwl_scan_cmd about max_out_time and quiet_time):

 * 1)  If using passive_dwell (i.e. passive_dwell != 0):

 * 1)  If using passive_dwell (i.e. passive_dwell != 0):

 *     active_dwell <= passive_dwell (< max_out_time if max_out_time != 0)

 *     active_dwell <= passive_dwell (< max_out_time if max_out_time != 0)

 * 2)  quiet_time <= active_dwell

 * 2)  quiet_time <= active_dwell
@@ -2118,7 +2118,7 @@ struct iwl4965_ct_kill_config { 
 *     passive_dwell < max_out_time

 *     passive_dwell < max_out_time

 *     active_dwell < max_out_time

 *     active_dwell < max_out_time

 */

 */

struct iwl4965_scan_channel {

struct iwl_scan_channel {

	/*

	/*

	 * type is defined as:

	 * type is defined as:

	 * 0:0 1 = active, 0 = passive

	 * 0:0 1 = active, 0 = passive
@@ -2134,13 +2134,13 @@ struct iwl4965_scan_channel { 
} __attribute__ ((packed));

} __attribute__ ((packed));





/**

/**

 * struct iwl4965_ssid_ie - directed scan network information element

 * struct iwl_ssid_ie - directed scan network information element

 *

 *

 * Up to 4 of these may appear in REPLY_SCAN_CMD, selected by "type" field

 * Up to 4 of these may appear in REPLY_SCAN_CMD, selected by "type" field

 * in struct iwl4965_scan_channel; each channel may select different ssids from

 * in struct iwl4965_scan_channel; each channel may select different ssids from

 * among the 4 entries.  SSID IEs get transmitted in reverse order of entry.

 * among the 4 entries.  SSID IEs get transmitted in reverse order of entry.

 */

 */

struct iwl4965_ssid_ie {

struct iwl_ssid_ie {

	u8 id;

	u8 id;

	u8 len;

	u8 len;

	u8 ssid[32];

	u8 ssid[32];
@@ -2201,9 +2201,9 @@ struct iwl4965_ssid_ie { 
 * Driver must use separate scan commands for 2.4 vs. 5 GHz bands.

 * Driver must use separate scan commands for 2.4 vs. 5 GHz bands.

 *

 *

 * To avoid uCode errors, see timing restrictions described under

 * To avoid uCode errors, see timing restrictions described under

 * struct iwl4965_scan_channel.

 * struct iwl_scan_channel.

 */

 */

struct iwl4965_scan_cmd {

struct iwl_scan_cmd {

	__le16 len;

	__le16 len;

	u8 reserved0;

	u8 reserved0;

	u8 channel_count;	/* # channels in channel list */

	u8 channel_count;	/* # channels in channel list */
@@ -2227,7 +2227,7 @@ struct iwl4965_scan_cmd { 
	struct iwl_tx_cmd tx_cmd;

	struct iwl_tx_cmd tx_cmd;





	/* For directed active scans (set to all-0s otherwise) */

	/* For directed active scans (set to all-0s otherwise) */

	struct iwl4965_ssid_ie direct_scan[PROBE_OPTION_MAX];

	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];





	/*

	/*

	 * Probe request frame, followed by channel list.

	 * Probe request frame, followed by channel list.
@@ -2255,14 +2255,14 @@ struct iwl4965_scan_cmd { 
/*

/*

 * REPLY_SCAN_CMD = 0x80 (response)

 * REPLY_SCAN_CMD = 0x80 (response)

 */

 */

struct iwl4965_scanreq_notification {

struct iwl_scanreq_notification {

	__le32 status;		/* 1: okay, 2: cannot fulfill request */

	__le32 status;		/* 1: okay, 2: cannot fulfill request */

} __attribute__ ((packed));

} __attribute__ ((packed));





/*

/*

 * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)

 * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)

 */

 */

struct iwl4965_scanstart_notification {

struct iwl_scanstart_notification {

	__le32 tsf_low;

	__le32 tsf_low;

	__le32 tsf_high;

	__le32 tsf_high;

	__le32 beacon_timer;

	__le32 beacon_timer;
@@ -2279,7 +2279,7 @@ struct iwl4965_scanstart_notification { 
/*

/*

 * SCAN_RESULTS_NOTIFICATION = 0x83 (notification only, not a command)

 * SCAN_RESULTS_NOTIFICATION = 0x83 (notification only, not a command)

 */

 */

struct iwl4965_scanresults_notification {

struct iwl_scanresults_notification {

	u8 channel;

	u8 channel;

	u8 band;

	u8 band;

	u8 reserved[2];

	u8 reserved[2];
@@ -2291,7 +2291,7 @@ struct iwl4965_scanresults_notification { 
/*

/*

 * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)

 * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)

 */

 */

struct iwl4965_scancomplete_notification {

struct iwl_scancomplete_notification {

	u8 scanned_channels;

	u8 scanned_channels;

	u8 status;

	u8 status;

	u8 reserved;

	u8 reserved;

drivers/net/wireless/iwlwifi/iwl-core.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,16 @@ int iwl_txq_check_empty(struct iwl_priv *priv, int sta_id, u8 tid, int txq_id); 
 ****************************************************/

 ****************************************************/

int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);

int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);





/*******************************************************************************

 * Scanning

 ******************************************************************************/

int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

const char *iwl_escape_essid(const char *essid, u8 essid_len);

int iwl_scan_initiate(struct iwl_priv *priv);

void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);

void iwl_setup_scan_deferred_work(struct iwl_priv *priv);



/*****************************************************

/*****************************************************

 *   S e n d i n g     H o s t     C o m m a n d s   *

 *   S e n d i n g     H o s t     C o m m a n d s   *

 *****************************************************/

 *****************************************************/

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -976,7 +976,7 @@ struct iwl_priv { 
	int one_direct_scan;

	int one_direct_scan;

	u8 direct_ssid_len;

	u8 direct_ssid_len;

	u8 direct_ssid[IW_ESSID_MAX_SIZE];

	u8 direct_ssid[IW_ESSID_MAX_SIZE];

	struct iwl4965_scan_cmd *scan;

	struct iwl_scan_cmd *scan;





	/* spinlock */

	/* spinlock */

	spinlock_t lock;	/* protect general shared data */

	spinlock_t lock;	/* protect general shared data */

drivers/net/wireless/iwlwifi/iwl-scan.c

0 → 100644
+896 −0

File added.

Preview size limit exceeded, changes collapsed.