Merge ~lihow731/network-manager:ubuntu/focal into network-manager:ubuntu/focal

[Leon Liao]

In some cases, the wow is not configured and the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE is set (for to disable management of wake-on-LAN in NetworkManager).

The network manager only checks the NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE bit.
But, the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE does not be check.
So, the management of wake-on-LAN still is done by NetworkManager.

This patch was sent to freedesktop and merged into ubuntu/master branch (in commit e7b44ef4c80907346ec7492a09c45277459924fc).
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/597

For OEM project (Focal), we need this patch. So, please help view this patch for ubuntu/focal branch.

[Iain Lane (laney)]

Thanks. Can you please add some DEP-3 patch headers to the patch? Author, Description, Origin, Forwarded, Applied-Upstream at least.

Please could you expand the commit / changelog message to say what the *problem* as well as the solution is?

And it would be nice if you could submit to Debian too on Salsa, so (1) more people can benefit from the fix, and (2) it will be less delta.

Thanks again!

https://dep-team.pages.debian.net/deps/dep3/
https://salsa.debian.org/utopia-team/network-manager/

review: Needs Fixing

[Leon Liao (lihow731)]

@Iain,

I completed the DEP-3 patch header, please help to view it.

And, I found this patch already merged into ubuntu/master.
So, I resubmit this MP for ubuntu/focal branch.

diff --git a/debian/changelog b/debian/changelog
index 6692d9e..c1e89ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.22.10-1ubuntu2.2) UNRELEASED; urgency=medium
+
+  * platform: add the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE status check
+
+ -- Li-Hao Liao (Leon Liao) <[e-mail]>  Tue, 25 Aug 2020 15:29:09 +0800
+
 network-manager (1.22.10-1ubuntu2.1) focal; urgency=medium
 
   * debian/rules:
diff --git a/debian/patches/add-the-NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE-status-check.patch b/debian/patches/add-the-NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE-status-check.patch
new file mode 100644
index 0000000..82deca3
--- /dev/null
+++ b/debian/patches/add-the-NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE-status-check.patch
@@ -0,0 +1,25 @@
+Description: platform: add the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE status check
+ In some cases, the wow is not configured and the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE is set. So, add the NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE status check.
+Author: Li-Hao Liao (Leon Liao) <[e-mail]>
+Origin: upstream, https://gitlab.freedesktop.org/NetworkManager/NetworkManager
+Forwarded: not-needed
+Applied-Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/3ba31aad5817547058c9d04dd4f690c6bd488cb4
+Last-Update: 2020-08-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: network-manager/src/platform/nm-linux-platform.c
+===================================================================
+--- network-manager.orig/src/platform/nm-linux-platform.c
++++ network-manager/src/platform/nm-linux-platform.c
+@@ -8196,7 +8196,10 @@ link_get_wake_on_lan (NMPlatform *platfo
+ 		if (!wifi_data)
+ 			return FALSE;
+ 
+-		return nm_wifi_utils_get_wake_on_wlan (wifi_data) != NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE;
++		return !NM_IN_SET (nm_wifi_utils_get_wake_on_wlan (wifi_data), 
++		                   NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE,
++		                   NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE);
++
+ 	} else
+ 		return FALSE;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f815073..b7f16d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
 # Ubuntu patches
 Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
 Update-dnsmasq-parameters.patch
+add-the-NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE-status-check.patch