patches/0069-iwlwifi-pd-string-fix.patch

   1 --- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
   2 +++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
   3 @@ -2421,12 +2421,23 @@ int iwl_dbgfs_register(struct iwl_priv *
   4          */
   5         if (priv->mac80211_registered) {
   6                 char buf[100];
   7 +#if LINUX_VERSION_IS_GEQ(3,12,0)
   8                 struct dentry *mac80211_dir, *dev_dir;
   9
  10                 dev_dir = dbgfs_dir->d_parent;
  11                 mac80211_dir = priv->hw->wiphy->debugfsdir;
  12
  13                 snprintf(buf, 100, "../../%pd2", dev_dir);
  14 +#else
  15 +               struct dentry *mac80211_dir, *dev_dir, *root_dir;
  16 +
  17 +               dev_dir = dbgfs_dir->d_parent;
  18 +               root_dir = dev_dir->d_parent;
  19 +               mac80211_dir = priv->hw->wiphy->debugfsdir;
  20 +
  21 +               snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name,
  22 +                        dev_dir->d_name.name);
  23 +#endif
  24
  25                 if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))
  26                         goto err;
  27 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
  28 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
  29 @@ -1573,8 +1573,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
  30         mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
  31
  32         if (!mvmvif->dbgfs_dir) {
  33 +#if LINUX_VERSION_IS_GEQ(3,12,0)
  34                 IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
  35                         dbgfs_dir);
  36 +#else
  37 +               IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",
  38 +                       dbgfs_dir->d_name.name);
  39 +#endif
  40                 return;
  41         }
  42
  43 @@ -1629,15 +1634,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
  44          * find
  45          * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
  46          */
  47 +#if LINUX_VERSION_IS_GEQ(3,12,0)
  48         snprintf(buf, 100, "../../../%pd3/%pd",
  49                  dbgfs_dir,
  50                  mvmvif->dbgfs_dir);
  51 +#else
  52 +       snprintf(buf, 100, "../../../%s/%s/%s/%s",
  53 +                dbgfs_dir->d_parent->d_parent->d_name.name,
  54 +                dbgfs_dir->d_parent->d_name.name,
  55 +                dbgfs_dir->d_name.name,
  56 +                mvmvif->dbgfs_dir->d_name.name);
  57 +#endif
  58
  59         mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name,
  60                                                      mvm->debugfs_dir, buf);
  61         if (!mvmvif->dbgfs_slink)
  62 +#if LINUX_VERSION_IS_GEQ(3,12,0)
  63                 IWL_ERR(mvm, "Can't create debugfs symbolic link under %pd\n",
  64                         dbgfs_dir);
  65 +#else
  66 +               IWL_ERR(mvm, "Can't create debugfs symbolic link under %s\n",
  67 +                       dbgfs_dir->d_name.name);
  68 +#endif
  69         return;
  70  err:
  71         IWL_ERR(mvm, "Can't create debugfs entity\n");
  72 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
  73 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
  74 @@ -1929,7 +1929,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv
  75          * Create a symlink with mac80211. It will be removed when mac80211
  76          * exists (before the opmode exists which removes the target.)
  77          */
  78 +#if LINUX_VERSION_IS_GEQ(3,12,0)
  79         snprintf(buf, 100, "../../%pd2", dbgfs_dir->d_parent);
  80 +#else
  81 +       snprintf(buf, 100, "../../%s/%s",
  82 +                dbgfs_dir->d_parent->d_parent->d_name.name,
  83 +                dbgfs_dir->d_parent->d_name.name);
  84 +#endif
  85         if (!debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf))
  86                 goto err;
  87