diff options
| author |   Sara Sharon <sara.sharon@intel.com> | 2016-10-25 11:38:31 +0300 |
|---|---|---|
| committer |   Luca Coelho <luciano.coelho@intel.com> | 2017-01-26 09:38:57 +0200 |
| commit | eef187a7b8a144a1a0c35c1ccccadc8fd5218504 (patch) | |
| tree | 7ef771f8141098b4807fe05ed3535fc2fcc36e03 /drivers/net/wireless/intel/iwlwifi/dvm | |
| parent | iwlwifi: mvm: replace the number of blocks calculation (diff) | |
| download | linux-dev-eef187a7b8a144a1a0c35c1ccccadc8fd5218504.tar.xz linux-dev-eef187a7b8a144a1a0c35c1ccccadc8fd5218504.zip | |
iwlwifi: enlarge number of ucode sections
The maximum number of firmware sections is now 32 instead of 16 for
a000 devices. Set the appropriate define. Avoid out of bounds access
in case there are more sections than the maximum set by driver.
Make the driver extensible to FW size changes by allocating the
section memory dynamically.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c index 8c0719468d00..2a04d0cd71ae 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c @@ -163,7 +163,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, REGULATORY_DISABLE_BEACON_HINTS; #ifdef CONFIG_PM_SLEEP - if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len && + if (priv->fw->img[IWL_UCODE_WOWLAN].num_sec && priv->trans->ops->d3_suspend && priv->trans->ops->d3_resume && device_can_wakeup(priv->trans->dev)) { diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c index c7509c51e9d9..d6013bfe991c 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c @@ -407,7 +407,7 @@ int iwl_run_init_ucode(struct iwl_priv *priv) lockdep_assert_held(&priv->mutex); /* No init ucode required? Curious, but maybe ok */ - if (!priv->fw->img[IWL_UCODE_INIT].sec[0].len) + if (!priv->fw->img[IWL_UCODE_INIT].num_sec) return 0; iwl_init_notification_wait(&priv->notif_wait, &calib_wait, |