diff options
| author |   Don Fry <donald.h.fry@intel.com> | 2011-11-28 17:05:01 -0800 |
|---|---|---|
| committer |   Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-02 08:23:13 -0800 |
| commit | 3d6acefc0a24bf90746c1f259e9d65d1ed7ea5e2 (patch) | |
| tree | facb569196c771c152c33488f760836dbc4ee51c /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
| parent | iwlwifi: replace iwl_priv reference with iwl_trans for ucode. (diff) | |
| download | linux-dev-3d6acefc0a24bf90746c1f259e9d65d1ed7ea5e2.tar.xz linux-dev-3d6acefc0a24bf90746c1f259e9d65d1ed7ea5e2.zip | |
iwlwifi: move ucode_type from iwl_priv to iwl_shared
Move the ucode_type variable from the iwl_priv to the iwl_shared
structure with associated code changes.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 68b04f5b10ce..ccbcab40e78f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -234,11 +234,12 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, /* default is to dump the entire data segment */ if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) { + struct iwl_trans *trans = trans(priv); priv->dbgfs_sram_offset = 0x800000; - if (priv->ucode_type == IWL_UCODE_INIT) - priv->dbgfs_sram_len = trans(priv)->ucode_init.data.len; + if (trans->shrd->ucode_type == IWL_UCODE_INIT) + priv->dbgfs_sram_len = trans->ucode_init.data.len; else - priv->dbgfs_sram_len = trans(priv)->ucode_rt.data.len; + priv->dbgfs_sram_len = trans->ucode_rt.data.len; } len = priv->dbgfs_sram_len; |