diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-12-03 07:21:36 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-03 07:21:55 -0500 |
commit | 18cfd3bfc904e2360af3a1c059c84b3f1944afb4 (patch) | |
tree | 1a46029642ddab79a64f659e7e03dad2d8ac86db /net/mac80211/iface.c | |
parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) |
Revert "mac80211: add driver callback for per-interface multicast filter"
This reverts commit 488b366a452934141959384c7a1b52b22d6154ef.
The code isn't used by anyone, and the Intel driver isn't planning
to use it either right now.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index d226751ba63a..3e5c89a295b9 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -1018,17 +1018,6 @@ static void ieee80211_set_multicast_list(struct net_device *dev) | |||
1018 | atomic_dec(&local->iff_promiscs); | 1018 | atomic_dec(&local->iff_promiscs); |
1019 | sdata->flags ^= IEEE80211_SDATA_PROMISC; | 1019 | sdata->flags ^= IEEE80211_SDATA_PROMISC; |
1020 | } | 1020 | } |
1021 | |||
1022 | /* | ||
1023 | * TODO: If somebody needs this on AP interfaces, | ||
1024 | * it can be enabled easily but multicast | ||
1025 | * addresses from VLANs need to be synced. | ||
1026 | */ | ||
1027 | if (sdata->vif.type != NL80211_IFTYPE_MONITOR && | ||
1028 | sdata->vif.type != NL80211_IFTYPE_AP_VLAN && | ||
1029 | sdata->vif.type != NL80211_IFTYPE_AP) | ||
1030 | drv_set_multicast_list(local, sdata, &dev->mc); | ||
1031 | |||
1032 | spin_lock_bh(&local->filter_lock); | 1021 | spin_lock_bh(&local->filter_lock); |
1033 | __hw_addr_sync(&local->mc_list, &dev->mc, dev->addr_len); | 1022 | __hw_addr_sync(&local->mc_list, &dev->mc, dev->addr_len); |
1034 | spin_unlock_bh(&local->filter_lock); | 1023 | spin_unlock_bh(&local->filter_lock); |