Skip to content

Commit

Permalink
mac80211: Adds clean sdata helper
Browse files Browse the repository at this point in the history 
Adds hepler to clean sdata ieee80211_clean_sdata similar way as
ieee80211_setup_sdata is implemented. The function will be used by other
interfaces later.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Andrei Emeltchenko authored and John W. Linville committed Apr 24, 2012
1 parent ad12886 commit 94c514f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
19 changes: 15 additions & 4 deletions net/mac80211/iface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,18 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
ieee80211_debugfs_add_netdev(sdata);
}

static void ieee80211_clean_sdata(struct ieee80211_sub_if_data *sdata)
{
switch (sdata->vif.type) {
case NL80211_IFTYPE_MESH_POINT:
mesh_path_flush_by_iface(sdata);
break;

default:
break;
}
}

static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata,
enum nl80211_iftype type)
{
Expand Down Expand Up @@ -1364,8 +1376,8 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)
list_del_rcu(&sdata->list);
mutex_unlock(&sdata->local->iflist_mtx);

if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_path_flush_by_iface(sdata);
/* clean up type-dependent data */
ieee80211_clean_sdata(sdata);

synchronize_rcu();
unregister_netdevice(sdata->dev);
Expand All @@ -1386,8 +1398,7 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local)
list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
list_del(&sdata->list);

if (ieee80211_vif_is_mesh(&sdata->vif))
mesh_path_flush_by_iface(sdata);
ieee80211_clean_sdata(sdata);

unregister_netdevice_queue(sdata->dev, &unreg_list);
}
Expand Down
4 changes: 3 additions & 1 deletion net/mac80211/mesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ void mesh_pathtbl_unregister(void);
int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata);
void mesh_path_timer(unsigned long data);
void mesh_path_flush_by_nexthop(struct sta_info *sta);
void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
void mesh_path_discard_frame(struct sk_buff *skb,
struct ieee80211_sub_if_data *sdata);
void mesh_path_quiesce(struct ieee80211_sub_if_data *sdata);
Expand Down Expand Up @@ -345,6 +344,7 @@ void ieee80211_mesh_quiesce(struct ieee80211_sub_if_data *sdata);
void ieee80211_mesh_restart(struct ieee80211_sub_if_data *sdata);
void mesh_plink_quiesce(struct sta_info *sta);
void mesh_plink_restart(struct sta_info *sta);
void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
#else
#define mesh_allocated 0
Expand All @@ -358,6 +358,8 @@ static inline void mesh_plink_quiesce(struct sta_info *sta) {}
static inline void mesh_plink_restart(struct sta_info *sta) {}
static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)
{ return false; }
static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
{}
#endif

#endif /* IEEE80211S_H */

0 comments on commit 94c514f

Please sign in to comment.