Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-core.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 32a990f..5b5b0cc 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -90,7 +90,6 @@ struct iwl_cmd;
 #define IWL_CMD(x) case x: return #x
 
 struct iwl_hcmd_ops {
-       int (*rxon_assoc)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
        int (*commit_rxon)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
        void (*set_rxon_chain)(struct iwl_priv *priv,
                               struct iwl_rxon_context *ctx);
@@ -100,7 +99,6 @@ struct iwl_hcmd_ops {
 };
 
 struct iwl_hcmd_utils_ops {
-       u16 (*get_hcmd_size)(u8 cmd_id, u16 len);
        u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);
        void (*gain_computation)(struct iwl_priv *priv,
                        u32 *average_noise,
@@ -122,19 +120,6 @@ struct iwl_apm_ops {
        void (*config)(struct iwl_priv *priv);
 };
 
-struct iwl_debugfs_ops {
-       ssize_t (*rx_stats_read)(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-       ssize_t (*tx_stats_read)(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-       ssize_t (*general_stats_read)(struct file *file, char __user *user_buf,
-                                     size_t count, loff_t *ppos);
-       ssize_t (*bt_stats_read)(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-       ssize_t (*reply_tx_error)(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-};
-
 struct iwl_temp_ops {
        void (*temperature)(struct iwl_priv *priv);
 };
@@ -143,11 +128,6 @@ struct iwl_lib_ops {
        /* set hw dependent parameters */
        int (*set_hw_params)(struct iwl_priv *priv);
        /* Handling TX */
-       void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,
-                                       struct iwl_tx_queue *txq,
-                                       u16 byte_cnt);
-       void (*txq_inval_byte_cnt_tbl)(struct iwl_priv *priv,
-                                      struct iwl_tx_queue *txq);
        void (*txq_set_sched)(struct iwl_priv *priv, u32 mask);
        int (*txq_attach_buf_to_tfd)(struct iwl_priv *priv,
                                     struct iwl_tx_queue *txq,
@@ -183,7 +163,6 @@ struct iwl_lib_ops {
        int (*txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
        void (*dev_txfifo_flush)(struct iwl_priv *priv, u16 flush_control);
 
-       struct iwl_debugfs_ops debugfs_ops;
 };
 
 /* NIC specific ops */
@@ -326,8 +305,6 @@ struct iwl_cfg {
        u16  eeprom_ver;
        u16  eeprom_calib_ver;
        const struct iwl_ops *ops;
-       /* module based parameters which can be set from modprobe cmd */
-       const struct iwl_mod_params *mod_params;
        /* params not likely to change within a device family */
        struct iwl_base_params *base_params;
        /* params likely to change within a device family */
@@ -592,6 +569,7 @@ void iwlcore_free_geos(struct iwl_priv *priv);
 #define STATUS_SCAN_HW         15
 #define STATUS_POWER_PMI       16
 #define STATUS_FW_ERROR                17
+#define STATUS_DEVICE_ENABLED  18
 
 
 static inline int iwl_is_ready(struct iwl_priv *priv)
@@ -644,11 +622,6 @@ void iwl_apm_stop(struct iwl_priv *priv);
 int iwl_apm_init(struct iwl_priv *priv);
 
 int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-static inline int iwl_send_rxon_assoc(struct iwl_priv *priv,
-                                     struct iwl_rxon_context *ctx)
-{
-       return priv->cfg->ops->hcmd->rxon_assoc(priv, ctx);
-}
 static inline int iwlcore_commit_rxon(struct iwl_priv *priv,
                                      struct iwl_rxon_context *ctx)
 {