Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327646
b: refs/heads/master
c: 3e17f2b
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Pedersen authored and Johannes Berg committed Aug 3, 2012
1 parent 2a7b585 commit 00aafba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d466b9c6798d431141ab15ae6d5ea413b4d09b2
refs/heads/master: 3e17f2be31f354fe03e1732bc527a31ff3dd3bb9
17 changes: 0 additions & 17 deletions trunk/net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -1155,18 +1155,6 @@ 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 @@ -1502,9 +1490,6 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)
list_del_rcu(&sdata->list);
mutex_unlock(&sdata->local->iflist_mtx);

/* clean up type-dependent data */
ieee80211_clean_sdata(sdata);

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

ieee80211_clean_sdata(sdata);

unregister_netdevice_queue(sdata->dev, &unreg_list);
}
mutex_unlock(&local->iflist_mtx);
Expand Down

0 comments on commit 00aafba

Please sign in to comment.