diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-07-15 08:57:48 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-07-23 11:42:18 -0400 |
commit | 0bc5774f4e1df0204e68bfcd84e122d430dcf35c (patch) | |
tree | f52c556f9874c5ed73513c44c5ccdcc84cbbfd45 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | 704da534af1e366214f790b381fed73ba6c5d37b (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 676d49df77ed..cb2d48a84fb9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1748,6 +1748,37 @@ static inline void iwl_set_no_assoc(struct iwl_priv *priv) | |||
1748 | iwlcore_commit_rxon(priv); | 1748 | iwlcore_commit_rxon(priv); |
1749 | } | 1749 | } |
1750 | 1750 | ||
1751 | static int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | ||
1752 | { | ||
1753 | struct iwl_priv *priv = hw->priv; | ||
1754 | unsigned long flags; | ||
1755 | __le64 timestamp; | ||
1756 | |||
1757 | IWL_DEBUG_MAC80211(priv, "enter\n"); | ||
1758 | |||
1759 | if (!iwl_is_ready_rf(priv)) { | ||
1760 | IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n"); | ||
1761 | return -EIO; | ||
1762 | } | ||
1763 | |||
1764 | spin_lock_irqsave(&priv->lock, flags); | ||
1765 | |||
1766 | if (priv->ibss_beacon) | ||
1767 | dev_kfree_skb(priv->ibss_beacon); | ||
1768 | |||
1769 | priv->ibss_beacon = skb; | ||
1770 | |||
1771 | timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; | ||
1772 | priv->timestamp = le64_to_cpu(timestamp); | ||
1773 | |||
1774 | IWL_DEBUG_MAC80211(priv, "leave\n"); | ||
1775 | spin_unlock_irqrestore(&priv->lock, flags); | ||
1776 | |||
1777 | priv->cfg->ops->lib->post_associate(priv, priv->vif); | ||
1778 | |||
1779 | return 0; | ||
1780 | } | ||
1781 | |||
1751 | void iwl_bss_info_changed(struct ieee80211_hw *hw, | 1782 | void iwl_bss_info_changed(struct ieee80211_hw *hw, |
1752 | struct ieee80211_vif *vif, | 1783 | struct ieee80211_vif *vif, |
1753 | struct ieee80211_bss_conf *bss_conf, | 1784 | struct ieee80211_bss_conf *bss_conf, |
@@ -1914,38 +1945,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, | |||
1914 | } | 1945 | } |
1915 | EXPORT_SYMBOL(iwl_bss_info_changed); | 1946 | EXPORT_SYMBOL(iwl_bss_info_changed); |
1916 | 1947 | ||
1917 | int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | ||
1918 | { | ||
1919 | struct iwl_priv *priv = hw->priv; | ||
1920 | unsigned long flags; | ||
1921 | __le64 timestamp; | ||
1922 | |||
1923 | IWL_DEBUG_MAC80211(priv, "enter\n"); | ||
1924 | |||
1925 | if (!iwl_is_ready_rf(priv)) { | ||
1926 | IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n"); | ||
1927 | return -EIO; | ||
1928 | } | ||
1929 | |||
1930 | spin_lock_irqsave(&priv->lock, flags); | ||
1931 | |||
1932 | if (priv->ibss_beacon) | ||
1933 | dev_kfree_skb(priv->ibss_beacon); | ||
1934 | |||
1935 | priv->ibss_beacon = skb; | ||
1936 | |||
1937 | timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; | ||
1938 | priv->timestamp = le64_to_cpu(timestamp); | ||
1939 | |||
1940 | IWL_DEBUG_MAC80211(priv, "leave\n"); | ||
1941 | spin_unlock_irqrestore(&priv->lock, flags); | ||
1942 | |||
1943 | priv->cfg->ops->lib->post_associate(priv, priv->vif); | ||
1944 | |||
1945 | return 0; | ||
1946 | } | ||
1947 | EXPORT_SYMBOL(iwl_mac_beacon_update); | ||
1948 | |||
1949 | static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif) | 1948 | static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif) |
1950 | { | 1949 | { |
1951 | iwl_connection_init_rx_config(priv, vif); | 1950 | iwl_connection_init_rx_config(priv, vif); |