diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-30 22:25:54 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-06 22:54:26 +0100 |
| commit | 9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch) | |
| tree | 9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0069-iwlwifi-pd-string-fix.patch | |
| parent | b198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff) | |
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports:
* patches/0090-use-skb_pad.patch
This patch was manually modified:
* patches/0025-usb-sg/usbnet.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0069-iwlwifi-pd-string-fix.patch')
| -rw-r--r-- | patches/0069-iwlwifi-pd-string-fix.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch index b2a6a512..ca7732d0 100644 --- a/patches/0069-iwlwifi-pd-string-fix.patch +++ b/patches/0069-iwlwifi-pd-string-fix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c -@@ -2419,12 +2419,23 @@ int iwl_dbgfs_register(struct iwl_priv * +@@ -2414,12 +2414,23 @@ int iwl_dbgfs_register(struct iwl_priv * */ if (priv->mac80211_registered) { char buf[100]; @@ -26,7 +26,7 @@ goto err; --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c -@@ -1497,8 +1497,13 @@ void iwl_mvm_vif_dbgfs_register(struct i +@@ -1492,8 +1492,13 @@ void iwl_mvm_vif_dbgfs_register(struct i mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); if (!mvmvif->dbgfs_dir) { @@ -40,7 +40,7 @@ return; } -@@ -1544,15 +1549,28 @@ void iwl_mvm_vif_dbgfs_register(struct i +@@ -1539,15 +1544,28 @@ void iwl_mvm_vif_dbgfs_register(struct i * find * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/ */ @@ -71,7 +71,7 @@ IWL_ERR(mvm, "Can't create debugfs entity\n"); --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c -@@ -2056,7 +2056,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv +@@ -2078,7 +2078,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv * Create a symlink with mac80211. It will be removed when mac80211 * exists (before the opmode exists which removes the target.) */ |