- upstream fixes for wireless-power

diff --git a/wireless-power-no-iw-txpower.patch b/wireless-power-no-iw-txpower.patch
new file mode 100644 (file)
index 0000000..38afeab
--- /dev/null
+++ b/wireless-power-no-iw-txpower.patch
@@ -0,0 +1,27 @@
+From 9ca191ff3e5b002f759d69435f14c7f54020085f Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@researchut.com>
+Date: Sun, 12 Mar 2017 17:03:42 +0530
+Subject: [PATCH] For iw, txpower needs a device specific value. Hence, drop it
+
+Thanks: Andrey Polyakov
+Closes: https://github.com/rickysarraf/laptop-mode-tools/pull/95
+---
+ usr/share/laptop-mode-tools/modules/wireless-power | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power
+index b84beb5..b17324d 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-power
++++ b/usr/share/laptop-mode-tools/modules/wireless-power
+@@ -66,11 +66,6 @@ setPowerSave() {
+ 
+       if [ -n "$IW" ]; then
+               $IW dev $IF set power_save $ONOFF
+-                if [ $ONOFF = "on" ]; then
+-                    $IW dev $IF set txpower auto
+-                else
+-                    $IW dev $IF set txpower fixed
+-                fi
+       else
+               $IWCONFIG $IF power $ONOFF
+                 if [ $ONOFF = "on" ]; then

diff --git a/wireless-power-on-off-fix.patch b/wireless-power-on-off-fix.patch
new file mode 100644 (file)
index 0000000..9833be7
--- /dev/null
+++ b/wireless-power-on-off-fix.patch
@@ -0,0 +1,48 @@
+From 791191702b91f7e23b280f35e292869631f5ba22 Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@researchut.com>
+Date: Sun, 12 Mar 2017 16:40:54 +0530
+Subject: [PATCH] Fix correct "ON" string
+
+Thanks: Andrey Polyakov
+
+Fix again
+---
+ usr/share/laptop-mode-tools/modules/wireless-power | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power
+index 8800a89..b84beb5 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-power
++++ b/usr/share/laptop-mode-tools/modules/wireless-power
+@@ -66,14 +66,14 @@ setPowerSave() {
+ 
+       if [ -n "$IW" ]; then
+               $IW dev $IF set power_save $ONOFF
+-                if [ $ONOFF = "ON" ]; then
++                if [ $ONOFF = "on" ]; then
+                     $IW dev $IF set txpower auto
+                 else
+                     $IW dev $IF set txpower fixed
+                 fi
+       else
+               $IWCONFIG $IF power $ONOFF
+-                if [ $ONOFF = "ON" ]; then
++                if [ $ONOFF = "on" ]; then
+                     $IWCONFIG $IF txpower auto
+                 else
+                     $IWCONFIG $IF txpower fixed
+@@ -106,10 +106,10 @@ if [ x$CONTROL_WIRELESS_POWER_SAVING = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x
+       fi
+ 
+       # Translate 1 => on, 0 => off
+-      WIRELESS_AC_POWER_SAVING_ONOFF=off
+-      WIRELESS_BATT_POWER_SAVING_ONOFF=off
+-      [ "$WIRELESS_AC_POWER_SAVING" = 1 ] && WIRELESS_AC_POWER_SAVING_ONOFF=on
+-      [ "$WIRELESS_BATT_POWER_SAVING" = 1 ] && WIRELESS_BATT_POWER_SAVING_ONOFF=on
++      WIRELESS_AC_POWER_SAVING_ONOFF="off"
++      WIRELESS_BATT_POWER_SAVING_ONOFF="off"
++      [ "$WIRELESS_AC_POWER_SAVING" = 1 ] && WIRELESS_AC_POWER_SAVING_ONOFF="on"
++      [ "$WIRELESS_BATT_POWER_SAVING" = 1 ] && WIRELESS_BATT_POWER_SAVING_ONOFF="on"
+ 
+       WIFI_IFNAMES=""
+       findWifiIfs