Commit c03e20fc authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

mac80211: fix compilation of mesh (although its disabled)

Mesh is currently disabled on mac80211, its marked
as broken. This patch gets it to compile though,
to account for the mac80211 workqueue changes.
There was a simple typo in the patches for mesh
for the workqueue migration, but we never compile
tested it as we couldn't even select mesh as its
broken. Lets at least let it compile for those
interested in getting it fixed.
Reported-by: default avatarPat Erley <pat-lkml@erley.org>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c10e47f4
...@@ -54,7 +54,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data) ...@@ -54,7 +54,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)
return; return;
} }
ieee80211_queue_work(local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&local->hw, &ifmsh->work);
} }
/** /**
...@@ -357,7 +357,7 @@ static void ieee80211_mesh_path_timer(unsigned long data) ...@@ -357,7 +357,7 @@ static void ieee80211_mesh_path_timer(unsigned long data)
return; return;
} }
ieee80211_queue_work(local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&local->hw, &ifmsh->work);
} }
struct mesh_table *mesh_table_grow(struct mesh_table *tbl) struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
...@@ -471,7 +471,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) ...@@ -471,7 +471,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
ifmsh->housekeeping = true; ifmsh->housekeeping = true;
ieee80211_queue_work(local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&local->hw, &ifmsh->work);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |
BSS_CHANGED_BEACON_ENABLED); BSS_CHANGED_BEACON_ENABLED);
} }
...@@ -619,7 +619,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) ...@@ -619,7 +619,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) list_for_each_entry_rcu(sdata, &local->interfaces, list)
if (ieee80211_vif_is_mesh(&sdata->vif)) if (ieee80211_vif_is_mesh(&sdata->vif))
ieee80211_queue_work(local->hw.workqueue, &sdata->u.mesh.work); ieee80211_queue_work(&local->hw, &sdata->u.mesh.work);
rcu_read_unlock(); rcu_read_unlock();
} }
...@@ -692,7 +692,7 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) ...@@ -692,7 +692,7 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
case IEEE80211_STYPE_PROBE_RESP: case IEEE80211_STYPE_PROBE_RESP:
case IEEE80211_STYPE_BEACON: case IEEE80211_STYPE_BEACON:
skb_queue_tail(&ifmsh->skb_queue, skb); skb_queue_tail(&ifmsh->skb_queue, skb);
ieee80211_queue_work(local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&local->hw, &ifmsh->work);
return RX_QUEUED; return RX_QUEUED;
} }
......
...@@ -660,14 +660,14 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) ...@@ -660,14 +660,14 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
spin_unlock(&ifmsh->mesh_preq_queue_lock); spin_unlock(&ifmsh->mesh_preq_queue_lock);
if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata))) if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata)))
ieee80211_queue_work(sdata->local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&sdata->local->hw, &ifmsh->work);
else if (time_before(jiffies, ifmsh->last_preq)) { else if (time_before(jiffies, ifmsh->last_preq)) {
/* avoid long wait if did not send preqs for a long time /* avoid long wait if did not send preqs for a long time
* and jiffies wrapped around * and jiffies wrapped around
*/ */
ifmsh->last_preq = jiffies - min_preq_int_jiff(sdata) - 1; ifmsh->last_preq = jiffies - min_preq_int_jiff(sdata) - 1;
ieee80211_queue_work(sdata->local->hw.workqueue, &ifmsh->work); ieee80211_queue_work(&sdata->local->hw, &ifmsh->work);
} else } else
mod_timer(&ifmsh->mesh_path_timer, ifmsh->last_preq + mod_timer(&ifmsh->mesh_path_timer, ifmsh->last_preq +
min_preq_int_jiff(sdata)); min_preq_int_jiff(sdata));
......
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