OSDN Git Service

iwlwifi: change number of PAPD groups in PHY DB
authorAriej Marjieh <ariej.marjieh@intel.com>
Sun, 2 Feb 2014 04:00:01 +0000 (06:00 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 6 Feb 2014 19:12:26 +0000 (21:12 +0200)
The number of the PAPD group was increased in new devices.
Since we might now get empty entries on older devices, don't
warn if an entry is empty.

Signed-off-by: Ariej Marjieh <ariej.marjieh@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/iwl-phy-db.c

index fa77d63..b761ac4 100644 (file)
@@ -72,7 +72,7 @@
 #include "iwl-trans.h"
 
 #define CHANNEL_NUM_SIZE       4       /* num of channels in calib_ch size */
-#define IWL_NUM_PAPD_CH_GROUPS 4
+#define IWL_NUM_PAPD_CH_GROUPS 7
 #define IWL_NUM_TXP_CH_GROUPS  9
 
 struct iwl_phy_db_entry {
@@ -383,7 +383,7 @@ static int iwl_phy_db_send_all_channel_groups(
                if (!entry)
                        return -EINVAL;
 
-               if (WARN_ON_ONCE(!entry->size))
+               if (!entry->size)
                        continue;
 
                /* Send the requested PHY DB section */