diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-03-08 08:46:15 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-18 15:10:05 -0400 |
commit | d260ff12e7768444b4da7612b785cfd7cbc1d1c1 (patch) | |
tree | c17e653ae686bdaa70120217f824ee0fbdfa79aa /net/mac80211 | |
parent | ddbfe860acc39d4856a86186eb8a292426ea6224 (diff) |
mac80211: remove vif debugfs driver callbacks
This basically reverts commit b207cdb07f3f01ec1adaac62e9d0cc918c60a81a.
Now is possible to use drv_{add,remove}_interface() and vif->debugfs_dir
to create/remove per interface debugfs files. Remove redundant
callbacks.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/driver-ops.h | 37 | ||||
-rw-r--r-- | net/mac80211/iface.c | 4 |
2 files changed, 0 insertions, 41 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 0059f3886d44..7b9ff53bd2e9 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h | |||
@@ -547,43 +547,6 @@ static inline void drv_sta_remove_debugfs(struct ieee80211_local *local, | |||
547 | local->ops->sta_remove_debugfs(&local->hw, &sdata->vif, | 547 | local->ops->sta_remove_debugfs(&local->hw, &sdata->vif, |
548 | sta, dir); | 548 | sta, dir); |
549 | } | 549 | } |
550 | |||
551 | static inline | ||
552 | void drv_add_interface_debugfs(struct ieee80211_local *local, | ||
553 | struct ieee80211_sub_if_data *sdata) | ||
554 | { | ||
555 | might_sleep(); | ||
556 | |||
557 | check_sdata_in_driver(sdata); | ||
558 | |||
559 | if (!local->ops->add_interface_debugfs) | ||
560 | return; | ||
561 | |||
562 | local->ops->add_interface_debugfs(&local->hw, &sdata->vif, | ||
563 | sdata->vif.debugfs_dir); | ||
564 | } | ||
565 | |||
566 | static inline | ||
567 | void drv_remove_interface_debugfs(struct ieee80211_local *local, | ||
568 | struct ieee80211_sub_if_data *sdata) | ||
569 | { | ||
570 | might_sleep(); | ||
571 | |||
572 | check_sdata_in_driver(sdata); | ||
573 | |||
574 | if (!local->ops->remove_interface_debugfs) | ||
575 | return; | ||
576 | |||
577 | local->ops->remove_interface_debugfs(&local->hw, &sdata->vif, | ||
578 | sdata->vif.debugfs_dir); | ||
579 | } | ||
580 | #else | ||
581 | static inline | ||
582 | void drv_add_interface_debugfs(struct ieee80211_local *local, | ||
583 | struct ieee80211_sub_if_data *sdata) {} | ||
584 | static inline | ||
585 | void drv_remove_interface_debugfs(struct ieee80211_local *local, | ||
586 | struct ieee80211_sub_if_data *sdata) {} | ||
587 | #endif | 550 | #endif |
588 | 551 | ||
589 | static inline __must_check | 552 | static inline __must_check |
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 9875e321c9e8..80e838bc875d 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -557,8 +557,6 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) | |||
557 | goto err_del_interface; | 557 | goto err_del_interface; |
558 | } | 558 | } |
559 | 559 | ||
560 | drv_add_interface_debugfs(local, sdata); | ||
561 | |||
562 | if (sdata->vif.type == NL80211_IFTYPE_AP) { | 560 | if (sdata->vif.type == NL80211_IFTYPE_AP) { |
563 | local->fif_pspoll++; | 561 | local->fif_pspoll++; |
564 | local->fif_probe_req++; | 562 | local->fif_probe_req++; |
@@ -846,8 +844,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
846 | case NL80211_IFTYPE_AP: | 844 | case NL80211_IFTYPE_AP: |
847 | skb_queue_purge(&sdata->skb_queue); | 845 | skb_queue_purge(&sdata->skb_queue); |
848 | 846 | ||
849 | drv_remove_interface_debugfs(local, sdata); | ||
850 | |||
851 | if (going_down) | 847 | if (going_down) |
852 | drv_remove_interface(local, sdata); | 848 | drv_remove_interface(local, sdata); |
853 | } | 849 | } |