iwlegacy: get rid of rxon_assoc_cmd

[karo-tx-linux.git] / drivers / net / wireless / iwlegacy / common.h

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index abfa388588be71ac318262581ce9fc27e50da53c..d8e309a1756a7b651a00949c104d6308ca85c514 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1171,22 +1171,10 @@ struct il_rxon_context {
        u32 interface_modes, exclusive_interface_modes;
        u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
 
-       /*
-        * We declare this const so it can only be
-        * changed via explicit cast within the
-        * routines that actually update the physical
-        * hardware.
-        */
-       const struct il_rxon_cmd active;
-       struct il_rxon_cmd staging;
-
-       struct il_rxon_time_cmd timing;
-
        struct il_qos_info qos_data;
 
        u8 bcast_sta_id, ap_sta_id;
 
-       u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;
        u8 qos_cmd;
        u8 wep_key_cmd;
 
@@ -1306,6 +1294,17 @@ struct il_priv {
 
        struct il_rxon_context ctx;
 
+       /*
+        * We declare this const so it can only be
+        * changed via explicit cast within the
+        * routines that actually update the physical
+        * hardware.
+        */
+       const struct il_rxon_cmd active;
+       struct il_rxon_cmd staging;
+
+       struct il_rxon_time_cmd timing;
+
        __le16 switch_channel;
 
        /* 1st responses from initialize and runtime uCode images.
@@ -1530,7 +1529,7 @@ il_rxon_ctx_from_vif(struct ieee80211_vif *vif)
 static inline int
 il_is_associated(struct il_priv *il)
 {
-       return (il->ctx.active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
+       return (il->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
 }
 
 static inline int
@@ -1539,12 +1538,6 @@ il_is_any_associated(struct il_priv *il)
        return il_is_associated(il);
 }
 
-static inline int
-il_is_associated_ctx(struct il_rxon_context *ctx)
-{
-       return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
-}
-
 static inline int
 il_is_channel_valid(const struct il_channel_info *ch_info)
 {