diff options
author | Thomas Pedersen <thomas@cozybit.com> | 2012-08-03 15:21:33 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-03 15:34:22 -0400 |
commit | 3e17f2be31f354fe03e1732bc527a31ff3dd3bb9 (patch) | |
tree | 30a99e21023dc6e64c324245f4ac539dff870fa2 /net/mac80211/iface.c | |
parent | 0d466b9c6798d431141ab15ae6d5ea413b4d09b2 (diff) |
mac80211: remove ieee80211_clean_sdata()
This function was only used by mesh, and not really needed since any
interface-specific cleanup already happens in the netdev handlers.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 5a81577879ed..abee3a0c25ed 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -1155,18 +1155,6 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, | |||
1155 | ieee80211_debugfs_add_netdev(sdata); | 1155 | ieee80211_debugfs_add_netdev(sdata); |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | static void ieee80211_clean_sdata(struct ieee80211_sub_if_data *sdata) | ||
1159 | { | ||
1160 | switch (sdata->vif.type) { | ||
1161 | case NL80211_IFTYPE_MESH_POINT: | ||
1162 | mesh_path_flush_by_iface(sdata); | ||
1163 | break; | ||
1164 | |||
1165 | default: | ||
1166 | break; | ||
1167 | } | ||
1168 | } | ||
1169 | |||
1170 | static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, | 1158 | static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, |
1171 | enum nl80211_iftype type) | 1159 | enum nl80211_iftype type) |
1172 | { | 1160 | { |
@@ -1502,9 +1490,6 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) | |||
1502 | list_del_rcu(&sdata->list); | 1490 | list_del_rcu(&sdata->list); |
1503 | mutex_unlock(&sdata->local->iflist_mtx); | 1491 | mutex_unlock(&sdata->local->iflist_mtx); |
1504 | 1492 | ||
1505 | /* clean up type-dependent data */ | ||
1506 | ieee80211_clean_sdata(sdata); | ||
1507 | |||
1508 | synchronize_rcu(); | 1493 | synchronize_rcu(); |
1509 | unregister_netdevice(sdata->dev); | 1494 | unregister_netdevice(sdata->dev); |
1510 | } | 1495 | } |
@@ -1524,8 +1509,6 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) | |||
1524 | list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { | 1509 | list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { |
1525 | list_del(&sdata->list); | 1510 | list_del(&sdata->list); |
1526 | 1511 | ||
1527 | ieee80211_clean_sdata(sdata); | ||
1528 | |||
1529 | unregister_netdevice_queue(sdata->dev, &unreg_list); | 1512 | unregister_netdevice_queue(sdata->dev, &unreg_list); |
1530 | } | 1513 | } |
1531 | mutex_unlock(&local->iflist_mtx); | 1514 | mutex_unlock(&local->iflist_mtx); |