backports: update 0069-iwlwifi-pd-string-fix.patch patch for v5.1
diff mbox series

Message ID 20190523023052.28420-1-acelan.kao@canonical.com
State New
Headers show
Series
  • backports: update 0069-iwlwifi-pd-string-fix.patch patch for v5.1
Related show

Commit Message

AceLan Kao May 23, 2019, 2:30 a.m. UTC
Fix 0069-iwlwifi-pd-string-fix.patch to match the code changes on v5.1
kernel.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 patches/0069-iwlwifi-pd-string-fix.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Patch
diff mbox series

diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch
index 8a2ae81a..eef1c903 100644
--- a/patches/0069-iwlwifi-pd-string-fix.patch
+++ b/patches/0069-iwlwifi-pd-string-fix.patch
@@ -1,3 +1,9 @@ 
+diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
+index d4b19673b06a..d4806c20dcbc 100644
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+index 6925527d8457..1cf9e0b6cde5 100644
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+index 776b24f54200..acc60acd6a3d 100644
 --- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
 +++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
 @@ -2386,12 +2386,23 @@ void iwl_dbgfs_register(struct iwl_priv
@@ -26,10 +32,10 @@ 
  	}
 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
-@@ -776,8 +776,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
- 	mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
+@@ -775,8 +775,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
  
- 	if (!mvmvif->dbgfs_dir) {
+ 	mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
+ 	if (IS_ERR_OR_NULL(mvmvif->dbgfs_dir)) {
 +#if LINUX_VERSION_IS_GEQ(3,12,0)
  		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
  			dbgfs_dir);
@@ -40,7 +46,7 @@ 
  		return;
  	}
  
-@@ -806,15 +811,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
+@@ -805,15 +810,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
  	 * find
  	 * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
  	 */