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

Commit 0bc5774f authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: make iwl_mac_beacon_update static 



This function is only needed in the same
file it is defined in, i.e. iwl-core.c

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 704da534

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

+31 −32
Original line number Diff line number Diff line
@@ -1748,6 +1748,37 @@ static inline void iwl_set_no_assoc(struct iwl_priv *priv) 
	iwlcore_commit_rxon(priv);

}



static int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct iwl_priv *priv = hw->priv;

	unsigned long flags;

	__le64 timestamp;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (!iwl_is_ready_rf(priv)) {

		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");

		return -EIO;

	}



	spin_lock_irqsave(&priv->lock, flags);



	if (priv->ibss_beacon)

		dev_kfree_skb(priv->ibss_beacon);



	priv->ibss_beacon = skb;



	timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;

	priv->timestamp = le64_to_cpu(timestamp);



	IWL_DEBUG_MAC80211(priv, "leave\n");

	spin_unlock_irqrestore(&priv->lock, flags);



	priv->cfg->ops->lib->post_associate(priv, priv->vif);



	return 0;

}



void iwl_bss_info_changed(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif,

			  struct ieee80211_bss_conf *bss_conf,
@@ -1914,38 +1945,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(iwl_bss_info_changed);



int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct iwl_priv *priv = hw->priv;

	unsigned long flags;

	__le64 timestamp;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (!iwl_is_ready_rf(priv)) {

		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");

		return -EIO;

	}



	spin_lock_irqsave(&priv->lock, flags);



	if (priv->ibss_beacon)

		dev_kfree_skb(priv->ibss_beacon);



	priv->ibss_beacon = skb;



	timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;

	priv->timestamp = le64_to_cpu(timestamp);



	IWL_DEBUG_MAC80211(priv, "leave\n");

	spin_unlock_irqrestore(&priv->lock, flags);



	priv->cfg->ops->lib->post_associate(priv, priv->vif);



	return 0;

}

EXPORT_SYMBOL(iwl_mac_beacon_update);



static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif)

{

	iwl_connection_init_rx_config(priv, vif);

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

+0 −1
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, 
				     struct ieee80211_vif *vif,

				     struct ieee80211_bss_conf *bss_conf,

				     u32 changes);

int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb);

int iwl_commit_rxon(struct iwl_priv *priv);

int iwl_mac_add_interface(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif);