mac80211: avoid spurious deauth frames/messages

[safe/jmp/linux-2.6] / net / mac80211 / driver-ops.h

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 4100c36..921dd9c 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -12,7 +12,11 @@ static inline int drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
 
 static inline int drv_start(struct ieee80211_local *local)
 {
-       int ret = local->ops->start(&local->hw);
+       int ret;
+
+       local->started = true;
+       smp_mb();
+       ret = local->ops->start(&local->hw);
        trace_drv_start(local, ret);
        return ret;
 }
@@ -21,6 +25,14 @@ static inline void drv_stop(struct ieee80211_local *local)
 {
        local->ops->stop(&local->hw);
        trace_drv_stop(local);
+
+       /* sync away all work on the tasklet before clearing started */
+       tasklet_disable(&local->tasklet);
+       tasklet_enable(&local->tasklet);
+
+       barrier();
+
+       local->started = false;
 }
 
 static inline int drv_add_interface(struct ieee80211_local *local,
@@ -55,16 +67,32 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
        trace_drv_bss_info_changed(local, vif, info, changed);
 }
 
+static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
+                                       int mc_count,
+                                       struct dev_addr_list *mc_list)
+{
+       u64 ret = 0;
+
+       if (local->ops->prepare_multicast)
+               ret = local->ops->prepare_multicast(&local->hw, mc_count,
+                                                   mc_list);
+
+       trace_drv_prepare_multicast(local, mc_count, ret);
+
+       return ret;
+}
+
 static inline void drv_configure_filter(struct ieee80211_local *local,
                                        unsigned int changed_flags,
                                        unsigned int *total_flags,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
+                                       u64 multicast)
 {
+       might_sleep();
+
        local->ops->configure_filter(&local->hw, changed_flags, total_flags,
-                                    mc_count, mc_list);
+                                    multicast);
        trace_drv_configure_filter(local, changed_flags, total_flags,
-                                           mc_count);
+                                  multicast);
 }
 
 static inline int drv_set_tim(struct ieee80211_local *local,
@@ -211,15 +239,16 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local)
 }
 
 static inline int drv_ampdu_action(struct ieee80211_local *local,
+                                  struct ieee80211_vif *vif,
                                   enum ieee80211_ampdu_mlme_action action,
                                   struct ieee80211_sta *sta, u16 tid,
                                   u16 *ssn)
 {
        int ret = -EOPNOTSUPP;
        if (local->ops->ampdu_action)
-               ret = local->ops->ampdu_action(&local->hw, action,
+               ret = local->ops->ampdu_action(&local->hw, vif, action,
                                               sta, tid, ssn);
-       trace_drv_ampdu_action(local, action, sta, tid, ssn, ret);
+       trace_drv_ampdu_action(local, vif, action, sta, tid, ssn, ret);
        return ret;
 }