Johannes Berg schrieb:
> This tries to make iwl4965 support mesh, but it doesn't actually work.
>
> Here's my s-o-b so anyone else can try to make it work, I haven't
> figured out yet what the bug is...
>
> It seems that the iwlwifi card doesn't beacon, so the mesh state machine
> gets stuck.
I got o11s mesh to work with iwl4965 some time ago including beaconing and forwarding of packets. Changing channel did not work, though.
My patch against the wireless testing tree as of 2008-02-28 is attached, perhaps you find some useful hints in there.
Unfortunately, I did not have the time to rebase my work since then...
Richard
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 48a6a85..feabc48 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -255,7 +255,7 @@ static int rs_send_lq_cmd(struct iwl4965_priv *priv,
};
if ((lq->sta_id == 0xFF) &&
- (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
+ (priv->iw_mode == IEEE80211_IF_TYPE_IBSS || priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT))
return -EINVAL;
if (lq->sta_id == 0xFF)
@@ -861,7 +861,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
if (!priv->lq_mngr.lq_ready)
return;
- if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
+ if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS || priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT) &&
!lq_sta->ibss_sta_added)
return;
@@ -2168,7 +2168,7 @@ static void rs_initialize_lq(struct iwl4965_priv *priv,
i = sta->last_txrate_idx;
if ((lq_sta->lq.sta_id == 0xff) &&
- (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
+ (priv->iw_mode == IEEE80211_IF_TYPE_IBSS || priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT))
goto out;
if (!lq_sta->search_better_tbl)
@@ -2235,7 +2235,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
lq_sta = (struct iwl4965_lq_sta *)sta->rate_ctrl_priv;
i = sta->last_txrate_idx;
- if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) &&
+ if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS || priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT) &&
!lq_sta->ibss_sta_added) {
u8 sta_id = iwl4965_hw_find_station(priv, hdr->addr1);
DECLARE_MAC_BUF(mac);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index a9c30bc..bbc91b3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -191,6 +191,7 @@ u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *addr)
DECLARE_MAC_BUF(mac);
if ((priv->iw_mode == IEEE80211_IF_TYPE_IBSS) ||
+ (priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT) ||
(priv->iw_mode == IEEE80211_IF_TYPE_AP))
start = IWL_STA_ID;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 20d012d..3633c1b 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -532,7 +532,6 @@ u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
return index;
}
-
IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
station = &priv->stations[index];
station->used = 1;
@@ -548,7 +547,8 @@ u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
#ifdef CONFIG_IWL4965_HT
/* BCAST station and IBSS stations do not work in HT mode */
if (index != priv->hw_setting.bcast_sta_id &&
- priv->iw_mode != IEEE80211_IF_TYPE_IBSS)
+ (priv->iw_mode != IEEE80211_IF_TYPE_MESH_POINT) &&
+ (priv->iw_mode != IEEE80211_IF_TYPE_IBSS))
iwl4965_set_ht_add_station(priv, index,
(struct ieee80211_ht_info *) ht_data);
#endif /*CONFIG_IWL4965_HT*/
@@ -1540,6 +1540,7 @@ unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,
if (!iwl4965_is_associated(priv) || !priv->ibss_beacon ||
((priv->iw_mode != IEEE80211_IF_TYPE_IBSS) &&
+ (priv->iw_mode != IEEE80211_IF_TYPE_MESH_POINT) &&
(priv->iw_mode != IEEE80211_IF_TYPE_AP)))
return 0;
@@ -2609,6 +2610,7 @@ static void iwl4965_connection_init_rx_config(struct iwl4965_priv *priv)
break;
case IEEE80211_IF_TYPE_IBSS:
+ case IEEE80211_IF_TYPE_MESH_POINT:
priv->staging_rxon.dev_type = RXON_DEV_TYPE_IBSS;
priv->staging_rxon.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
priv->staging_rxon.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
@@ -2850,6 +2852,7 @@ static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
/* If this frame is going out to an IBSS network, find the station,
* or create a new station table entry */
case IEEE80211_IF_TYPE_IBSS:
+ case IEEE80211_IF_TYPE_MESH_POINT:
sta_id = iwl4965_hw_find_station(priv, hdr->addr1);
if (sta_id != IWL_INVALID_STATION)
return sta_id;
@@ -7170,6 +7177,7 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
break;
case IEEE80211_IF_TYPE_IBSS:
+ case IEEE80211_IF_TYPE_MESH_POINT:
/* clear out the station table */
iwl4965_clear_stations_table(priv);
@@ -7195,7 +7203,7 @@ static void iwl4965_bg_post_associate(struct work_struct *data)
priv->start_calib = 1;
#endif /* CONFIG_IWL4965_SENSITIVITY */
- if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS)
+ if (priv->iw_mode == IEEE80211_IF_TYPE_IBSS || priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT)
priv->assoc_station_added = 1;
iwl4965_activate_qos(priv, 0);
@@ -7643,6 +7651,12 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
priv->ibss_beacon = conf->beacon;
}
+ if (priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT) {
+ if (priv->ibss_beacon)
+ dev_kfree_skb(priv->ibss_beacon);
+ priv->ibss_beacon = conf->beacon;
+ }
+
if (iwl4965_is_rfkill(priv))
goto done;
@@ -7693,6 +7707,11 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
IWL_DEBUG_MAC80211("leave\n");
mutex_unlock(&priv->mutex);
+ if (priv->iw_mode == IEEE80211_IF_TYPE_MESH_POINT) {
+ iwl4965_reset_qos(priv);
+ queue_work(priv->workqueue, &priv->post_associate.work);
+ }
+
return 0;
}
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 5ca576e..3c3f62f 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -83,7 +83,7 @@ endmenu
config MAC80211_MESH
bool "Enable mac80211 mesh networking (pre-802.11s) support"
- depends on MAC80211 && EXPERIMENTAL && BROKEN
+ depends on MAC80211 && EXPERIMENTAL
---help---
This options enables support of Draft 802.11s mesh networking.
The implementation is based on Draft 1.08 of the Mesh Networking
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 727af29..e9e6b8d 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -938,6 +938,7 @@ static int __ieee80211_if_config(struct net_device *dev,
conf.ssid_len = sdata->u.sta.ssid_len;
} else if (ieee80211_vif_is_mesh(&sdata->vif)) {
conf.beacon = beacon;
+ conf.beacon_control = control;
ieee80211_start_mesh(dev);
} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
conf.ssid = sdata->u.ap.ssid;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1ff1301..1aa99e6 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -316,7 +316,8 @@ static void ieee80211_verify_ip_alignment(struct ieee80211_txrx_data *rx)
hdrlen = ieee80211_get_hdrlen(rx->fc);
if (rx->flags & IEEE80211_TXRXD_RX_AMSDU)
hdrlen += ETH_HLEN;
- WARN_ON_ONCE(((unsigned long)(rx->skb->data + hdrlen)) & 3);
+// WARN_ON_ONCE(((unsigned long)(rx->skb->data + hdrlen)) & 3);
+// warning disabled, happens in MESH mode
#endif
}
