Commit c46fbefa authored by Assaf Krauss's avatar Assaf Krauss Committed by John W. Linville

iwlwifi enabling IBSS (Ad-Hoc) mode

This patch enables ibss mode. It consists of two changes upon entering ibss
mode:
1. Removing the redundant line which clears the driver's station table.
   This line creates a discrepancy between the driver and the FW's station
   table. This prevented the generation of beacons.
2. Assigning a default value to priv's assoc_id. Normally given by an AP in
   STA mode, this field is used as an indication for association. Being 0,
   it prevented normal TX flow.
3. Remove a redundant ADD_STA command that cause uCode error.
4. Delay the set_mode until after the uCode is ready.
Signed-off-by: default avatarAssaf Krauss <assaf.krauss@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
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 f3d5b45b
...@@ -284,6 +284,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv); ...@@ -284,6 +284,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv);
#define STATUS_POWER_PMI 16 #define STATUS_POWER_PMI 16
#define STATUS_FW_ERROR 17 #define STATUS_FW_ERROR 17
#define STATUS_CONF_PENDING 18 #define STATUS_CONF_PENDING 18
#define STATUS_MODE_PENDING 19
static inline int iwl_is_ready(struct iwl_priv *priv) static inline int iwl_is_ready(struct iwl_priv *priv)
......
...@@ -2900,6 +2900,10 @@ static void iwl_alive_start(struct iwl_priv *priv) ...@@ -2900,6 +2900,10 @@ static void iwl_alive_start(struct iwl_priv *priv)
iwlcore_low_level_notify(priv, IWLCORE_START_EVT); iwlcore_low_level_notify(priv, IWLCORE_START_EVT);
ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
iwl4965_set_mode(priv, priv->iw_mode);
return; return;
restart: restart:
...@@ -3189,16 +3193,20 @@ static void iwl4965_bg_set_monitor(struct work_struct *work) ...@@ -3189,16 +3193,20 @@ static void iwl4965_bg_set_monitor(struct work_struct *work)
{ {
struct iwl_priv *priv = container_of(work, struct iwl_priv *priv = container_of(work,
struct iwl_priv, set_monitor); struct iwl_priv, set_monitor);
int ret;
IWL_DEBUG(IWL_DL_STATE, "setting monitor mode\n"); IWL_DEBUG(IWL_DL_STATE, "setting monitor mode\n");
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
if (!iwl_is_ready(priv)) ret = iwl4965_set_mode(priv, IEEE80211_IF_TYPE_MNTR);
if (ret) {
if (ret == -EAGAIN)
IWL_DEBUG(IWL_DL_STATE, "leave - not ready\n"); IWL_DEBUG(IWL_DL_STATE, "leave - not ready\n");
else else
if (iwl4965_set_mode(priv, IEEE80211_IF_TYPE_MNTR) != 0) IWL_ERROR("iwl4965_set_mode() failed ret = %d\n", ret);
IWL_ERROR("iwl4965_set_mode() failed\n"); }
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
} }
...@@ -3575,10 +3583,9 @@ static void iwl4965_post_associate(struct iwl_priv *priv) ...@@ -3575,10 +3583,9 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
case IEEE80211_IF_TYPE_IBSS: case IEEE80211_IF_TYPE_IBSS:
/* clear out the station table */ /* assume default assoc id */
iwlcore_clear_stations_table(priv); priv->assoc_id = 1;
iwl_rxon_add_station(priv, iwl_bcast_addr, 0);
iwl_rxon_add_station(priv, priv->bssid, 0); iwl_rxon_add_station(priv, priv->bssid, 0);
iwl4965_rate_scale_init(priv->hw, IWL_STA_ID); iwl4965_rate_scale_init(priv->hw, IWL_STA_ID);
iwl4965_send_beacon_cmd(priv); iwl4965_send_beacon_cmd(priv);
...@@ -3826,8 +3833,9 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw, ...@@ -3826,8 +3833,9 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN); memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
} }
if (iwl_is_ready(priv)) if (iwl4965_set_mode(priv, conf->type) == -EAGAIN)
iwl4965_set_mode(priv, conf->type); /* we are not ready, will run again when ready */
set_bit(STATUS_MODE_PENDING, &priv->status);
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
...@@ -4608,7 +4616,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk ...@@ -4608,7 +4616,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
iwl_reset_qos(priv); iwl_reset_qos(priv);
queue_work(priv->workqueue, &priv->post_associate.work); iwl4965_post_associate(priv);
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment