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

Commit 06fd3d86 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945/iwlwifi: unify add_station function 



Patch unifies the add_station function for 3945 and 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 e11bc028

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

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, 
			IWL_DEBUG_RATE(priv, "LQ: ADD station %pm\n",

				       hdr->addr1);

			sta_id = iwl3945_add_station(priv,

				    hdr->addr1, 0, CMD_ASYNC);

				    hdr->addr1, 0, CMD_ASYNC, NULL);

		}

		if (sta_id != IWL_INVALID_STATION)

			rs_sta->ibss_sta_added = 1;

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

+2 −2
Original line number Diff line number Diff line
@@ -2125,7 +2125,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) 
	}



	/* Add the broadcast address so we can send broadcast frames */

	if (priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0) ==

	if (priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0, NULL) ==

	    IWL_INVALID_STATION) {

		IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");

		return -EIO;
@@ -2136,7 +2136,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) 
	if (iwl_is_associated(priv) &&

	    (priv->iw_mode == NL80211_IFTYPE_STATION))

		if (priv->cfg->ops->smgmt->add_station(priv,

					priv->active_rxon.bssid_addr, 1, 0)

					priv->active_rxon.bssid_addr, 1, 0, NULL)

		    == IWL_INVALID_STATION) {

			IWL_ERR(priv, "Error adding AP address for transmit\n");

			return -EIO;

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

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct iwl3945_addsta_cmd; 
extern int iwl3945_send_add_station(struct iwl_priv *priv,

				struct iwl3945_addsta_cmd *sta, u8 flags);

extern u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *bssid,

			  int is_ap, u8 flags);

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

extern void iwl3945_clear_stations_table(struct iwl_priv *priv);

extern int iwl3945_power_init_handle(struct iwl_priv *priv);

extern int iwl3945_eeprom_init(struct iwl_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -2269,7 +2269,7 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv) 
}



static struct iwl_station_mgmt_ops iwl4965_station_mgmt = {

	.add_station_ht = iwl_add_station_flags,

	.add_station = iwl_add_station_flags,

	.remove_station = iwl_remove_station,

	.find_station = iwl_find_station,

	.clear_station_table = iwl_clear_stations_table,

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

+1 −1
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ int iwl5000_calc_rssi(struct iwl_priv *priv, 
}



struct iwl_station_mgmt_ops iwl5000_station_mgmt = {

	.add_station_ht = iwl_add_station_flags,

	.add_station = iwl_add_station_flags,

	.remove_station = iwl_remove_station,

	.find_station = iwl_find_station,

	.clear_station_table = iwl_clear_stations_table,