bna: get rid of mac_t

[cascardo/linux.git] / net / mac80211 / driver-ops.h

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 26e1ca8..32a2e70 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -146,7 +146,7 @@ static inline int drv_add_interface(struct ieee80211_local *local,
 
        if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
                    (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
-                    !(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF) &&
+                    !ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF) &&
                     !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))))
                return -EINVAL;
 
@@ -417,12 +417,13 @@ static inline int drv_get_stats(struct ieee80211_local *local,
        return ret;
 }
 
-static inline void drv_get_tkip_seq(struct ieee80211_local *local,
-                                   u8 hw_key_idx, u32 *iv32, u16 *iv16)
+static inline void drv_get_key_seq(struct ieee80211_local *local,
+                                  struct ieee80211_key *key,
+                                  struct ieee80211_key_seq *seq)
 {
-       if (local->ops->get_tkip_seq)
-               local->ops->get_tkip_seq(&local->hw, hw_key_idx, iv32, iv16);
-       trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
+       if (local->ops->get_key_seq)
+               local->ops->get_key_seq(&local->hw, &key->conf, seq);
+       trace_drv_get_key_seq(local, &key->conf);
 }
 
 static inline int drv_set_frag_threshold(struct ieee80211_local *local,