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

Commit 79fa455a authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwlwifi: add station management ops 



This patch adds declarations for station management ops to iwlwifi drivers.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f45c2714

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

+10 −0
Original line number Diff line number Diff line
@@ -2954,6 +2954,15 @@ static struct iwl_lib_ops iwl3945_lib = { 
	.post_associate = iwl3945_post_associate,

};



static struct iwl_station_mgmt_ops iwl3945_station_mgmt = {

	.add_station = iwl3945_add_station,

#if 0

	.remove_station = iwl3945_remove_station,

#endif

	.find_station = iwl3945_hw_find_station,

	.clear_station_table = iwl3945_clear_stations_table,

};



static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {

	.get_hcmd_size = iwl3945_get_hcmd_size,

	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
@@ -2963,6 +2972,7 @@ static struct iwl_ops iwl3945_ops = { 
	.lib = &iwl3945_lib,

	.hcmd = &iwl3945_hcmd,

	.utils = &iwl3945_hcmd_utils,

	.smgmt = &iwl3945_station_mgmt,

};



static struct iwl_cfg iwl3945_bg_cfg = {

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

+7 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,12 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv) 
	cancel_work_sync(&priv->txpower_work);

}



static struct iwl_station_mgmt_ops iwl4965_station_mgmt = {

	.add_station_ht = iwl_add_station_flags,

	.remove_station = iwl_remove_station,

	.find_station = iwl_find_station,

	.clear_station_table = iwl_clear_stations_table,

};



static struct iwl_hcmd_ops iwl4965_hcmd = {

	.rxon_assoc = iwl4965_send_rxon_assoc,
@@ -2332,6 +2338,7 @@ static struct iwl_ops iwl4965_ops = { 
	.lib = &iwl4965_lib,

	.hcmd = &iwl4965_hcmd,

	.utils = &iwl4965_hcmd_utils,

	.smgmt = &iwl4965_station_mgmt,

};



struct iwl_cfg iwl4965_agn_cfg = {

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

+8 −0
Original line number Diff line number Diff line
@@ -1472,6 +1472,13 @@ int iwl5000_calc_rssi(struct iwl_priv *priv, 
	return max_rssi - agc - IWL49_RSSI_OFFSET;

}



struct iwl_station_mgmt_ops iwl5000_station_mgmt = {

	.add_station_ht = iwl_add_station_flags,

	.remove_station = iwl_remove_station,

	.find_station = iwl_find_station,

	.clear_station_table = iwl_clear_stations_table,

};



struct iwl_hcmd_ops iwl5000_hcmd = {

	.rxon_assoc = iwl5000_send_rxon_assoc,

	.commit_rxon = iwl_commit_rxon,
@@ -1535,6 +1542,7 @@ struct iwl_ops iwl5000_ops = { 
	.lib = &iwl5000_lib,

	.hcmd = &iwl5000_hcmd,

	.utils = &iwl5000_hcmd_utils,

	.smgmt = &iwl5000_station_mgmt,

};



struct iwl_mod_params iwl50_mod_params = {

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static struct iwl_ops iwl6000_ops = { 
	.lib = &iwl5000_lib,

	.hcmd = &iwl5000_hcmd,

	.utils = &iwl6000_hcmd_utils,

	.smgmt = &iwl5000_station_mgmt,

};



struct iwl_cfg iwl6000_2ag_cfg = {

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

+13 −0
Original line number Diff line number Diff line
@@ -83,10 +83,22 @@ struct iwl_cmd; 
#define IWL_SKU_A       0x2

#define IWL_SKU_N       0x8



struct iwl_station_mgmt_ops {

	u8 (*add_station_ht)(struct iwl_priv *priv, const u8 *addr,

			int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);

	u8 (*add_station)(struct iwl_priv *priv, const u8 *addr,

			int is_ap, u8 flags);

	int (*remove_station)(struct iwl_priv *priv, const u8 *addr,

			int is_ap);

	u8 (*find_station)(struct iwl_priv *priv, const u8 *addr);

	void (*clear_station_table)(struct iwl_priv *priv);

};



struct iwl_hcmd_ops {

	int (*rxon_assoc)(struct iwl_priv *priv);

	int (*commit_rxon)(struct iwl_priv *priv);

};



struct iwl_hcmd_utils_ops {

	u16 (*get_hcmd_size)(u8 cmd_id, u16 len);

	u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);
@@ -160,6 +172,7 @@ struct iwl_ops { 
	const struct iwl_lib_ops *lib;

	const struct iwl_hcmd_ops *hcmd;

	const struct iwl_hcmd_utils_ops *utils;

	const struct iwl_station_mgmt_ops *smgmt;

};



struct iwl_mod_params {