mac80211: allow configure_filter callback to sleep

Over time, a whole bunch of drivers have come up
with their own scheme to delay the configure_filter
operation to a workqueue. To be able to simplify
things, allow configure_filter to sleep, and add
a new prepare_multicast callback that drivers that
need the multicast address list implement. This new
callback must be atomic, but most drivers either
don't care or just calculate a hash which can be
done atomically and then uploaded to the hardware
non-atomically.

A cursory look suggests that at76c50x-usb, ar9170,
mwl8k (which is actually very broken now), rt2x00,
wl1251, wl1271 and zd1211 should make use of this
new capability.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 30 insertions, 6 deletions

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 5a10da2d70fd..37b9051afcf3 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -191,31 +191,55 @@ TRACE_EVENT(drv_bss_info_changed,
         )
 );
 
+TRACE_EVENT(drv_prepare_multicast,
+        TP_PROTO(struct ieee80211_local *local, int mc_count, u64 ret),
+
+        TP_ARGS(local, mc_count, ret),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                __field(int, mc_count)
+                __field(u64, ret)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                __entry->mc_count = mc_count;
+                __entry->ret = ret;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT " prepare mc (%d): %llx",
+                LOCAL_PR_ARG, __entry->mc_count,
+                (unsigned long long) __entry->ret
+        )
+);
+
 TRACE_EVENT(drv_configure_filter,
         TP_PROTO(struct ieee80211_local *local,
                  unsigned int changed_flags,
                  unsigned int *total_flags,
-                 int mc_count),
+                 u64 multicast),
 
-        TP_ARGS(local, changed_flags, total_flags, mc_count),
+        TP_ARGS(local, changed_flags, total_flags, multicast),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
                 __field(unsigned int, changed)
                 __field(unsigned int, total)
-                __field(int, mc)
+                __field(u64, multicast)
         ),
 
         TP_fast_assign(
                 LOCAL_ASSIGN;
                 __entry->changed = changed_flags;
                 __entry->total = *total_flags;
-                __entry->mc = mc_count;
+                __entry->multicast = multicast;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT " changed:%#x total:%#x mc:%d",
-                LOCAL_PR_ARG, __entry->changed, __entry->total, __entry->mc
+                LOCAL_PR_FMT " changed:%#x total:%#x",
+                LOCAL_PR_ARG, __entry->changed, __entry->total
         )
 );