diff --git a/patches/frameworks/opt/net/wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch b/patches/frameworks/opt/net/wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
index 48be182..67490f4 100644
--- a/patches/frameworks/opt/net/wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
+++ b/patches/frameworks/opt/net/wifi/0001-Revert-SupplicantManager-Remove-ensure_config_file_e.patch
@@ -1,4 +1,4 @@
-From 327d25dd7f34dbf3218ad989d4de538515d3c189 Mon Sep 17 00:00:00 2001
+From 577b3801db3060a5ceff1171569b17e2c7a6d299 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 16:59:12 +0200
 Subject: [PATCH 1/3] Revert "SupplicantManager: Remove
@@ -6,11 +6,11 @@
 
 This reverts commit f61dc8cd7dadda5741d6e4a1bb6b576ba89cc24b.
 ---
- libwifi_system/supplicant_manager.cpp | 97 +++++++++++++++++++++++++++++++++++
+ libwifi_system/supplicant_manager.cpp | 97 +++++++++++++++++++++++++++
  1 file changed, 97 insertions(+)
 
 diff --git a/libwifi_system/supplicant_manager.cpp b/libwifi_system/supplicant_manager.cpp
-index 5667648..be0c33a 100644
+index 5667648b3..be0c33a8a 100644
 --- a/libwifi_system/supplicant_manager.cpp
 +++ b/libwifi_system/supplicant_manager.cpp
 @@ -33,7 +33,89 @@ namespace wifi_system {
@@ -126,5 +126,5 @@
     * Get a reference to the status property, so we can distinguish
     * the case where it goes stopped => running => stopped (i.e.,
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/frameworks/opt/net/wifi/0002-Start-supplicant-later.patch b/patches/frameworks/opt/net/wifi/0002-Start-supplicant-later.patch
index c841f21..2f7aa0e 100644
--- a/patches/frameworks/opt/net/wifi/0002-Start-supplicant-later.patch
+++ b/patches/frameworks/opt/net/wifi/0002-Start-supplicant-later.patch
@@ -1,15 +1,15 @@
-From a891832a0b7aa42978630532cb5bba2c45e7633d Mon Sep 17 00:00:00 2001
+From 5427620c157f9ef0c6948c31868f273d8ca27b74 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 15 Aug 2018 00:04:45 +0200
 Subject: [PATCH 2/3] Start supplicant later
 
 Change-Id: I6a67baad486162415840006711fb6d8dbf96a66a
 ---
- service/java/com/android/server/wifi/WifiNative.java | 16 ++++++++++------
+ .../java/com/android/server/wifi/WifiNative.java | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
-index 0f78587..18f06f7 100644
+index bc599c141..eb5e11aca 100644
 --- a/service/java/com/android/server/wifi/WifiNative.java
 +++ b/service/java/com/android/server/wifi/WifiNative.java
 @@ -332,13 +332,15 @@ public class WifiNative {
@@ -63,5 +63,5 @@
                  Log.e(TAG, "Failed to setup iface in wificond on " + iface);
                  teardownInterface(iface.name);
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/frameworks/opt/net/wifi/0003-Support-hostap-on-O-O-MR1-vendors.patch b/patches/frameworks/opt/net/wifi/0003-Support-hostap-on-O-O-MR1-vendors.patch
index d48b353..33b17a7 100644
--- a/patches/frameworks/opt/net/wifi/0003-Support-hostap-on-O-O-MR1-vendors.patch
+++ b/patches/frameworks/opt/net/wifi/0003-Support-hostap-on-O-O-MR1-vendors.patch
@@ -1,4 +1,4 @@
-From 0ff44cc65aa9dc16ff9f0301142b9b537b4912f8 Mon Sep 17 00:00:00 2001
+From 9aaa142521aabfd63d31abdf1da2aea4d07813a1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
 Date: Tue, 18 Sep 2018 17:05:07 +0200
 Subject: [PATCH 3/3] Support hostap on O/O-MR1 vendors
@@ -11,12 +11,12 @@
 Now, it is a requirement to be supported, so most(all?) HALs don't
 support it. force stop/start for every reconfiguration
 ---
- .../com/android/server/wifi/HalDeviceManager.java  | 22 ++++++++++++++++++++--
- .../java/com/android/server/wifi/WifiNative.java   | 15 ++++++++++++++-
+ .../android/server/wifi/HalDeviceManager.java | 22 +++++++++++++++++--
+ .../com/android/server/wifi/WifiNative.java   | 15 ++++++++++++-
  2 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
-index 3c61217..68fc9cc 100644
+index 3c61217d7..68fc9ccfa 100644
 --- a/service/java/com/android/server/wifi/HalDeviceManager.java
 +++ b/service/java/com/android/server/wifi/HalDeviceManager.java
 @@ -63,8 +63,8 @@ import java.util.Set;
@@ -63,7 +63,7 @@
      }
  
 diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
-index 18f06f7..3680f14 100644
+index eb5e11aca..af8ccc8d9 100644
 --- a/service/java/com/android/server/wifi/WifiNative.java
 +++ b/service/java/com/android/server/wifi/WifiNative.java
 @@ -692,8 +692,21 @@ public class WifiNative {
@@ -90,5 +90,5 @@
                  Log.i(TAG, "Vendor Hal not supported, ignoring createApIface.");
                  return handleIfaceCreationWhenVendorHalNotSupported(iface);
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/frameworks/opt/telephony/0001-Add-route-to-gateway-on-null-netmask.patch b/patches/frameworks/opt/telephony/0001-Add-route-to-gateway-on-null-netmask.patch
index 35e2e0e..4e6bbcb 100644
--- a/patches/frameworks/opt/telephony/0001-Add-route-to-gateway-on-null-netmask.patch
+++ b/patches/frameworks/opt/telephony/0001-Add-route-to-gateway-on-null-netmask.patch
@@ -1,4 +1,4 @@
-From 3c8c5e2125a845d6868be27c389a5cfb5200e187 Mon Sep 17 00:00:00 2001
+From 0bd942753da9a6c8d7207afb1e0354a9873ddb69 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 16 Aug 2018 22:12:46 +0200
 Subject: [PATCH 1/2] Add route to gateway on null netmask
@@ -7,11 +7,11 @@
 
 Change-Id: I8133da8e8f5203666684100009ba658528a02e94
 ---
- .../telephony/dataconnection/DataConnection.java        | 17 +++++++++++++++++
+ .../dataconnection/DataConnection.java          | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
-index 0696aa9..11947a5 100644
+index 0696aa931..11947a5af 100644
 --- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
 +++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
 @@ -24,6 +24,7 @@ import android.content.Context;
@@ -46,5 +46,5 @@
                      // this indicates a point-to-point interface.
                      linkProperties.addRoute(new RouteInfo(gateway));
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/frameworks/opt/telephony/0002-Allow-LocaleTracker-to-work-even-if-wifi-is-not-up-F.patch b/patches/frameworks/opt/telephony/0002-Allow-LocaleTracker-to-work-even-if-wifi-is-not-up-F.patch
index 5ea34d1..a6069b0 100644
--- a/patches/frameworks/opt/telephony/0002-Allow-LocaleTracker-to-work-even-if-wifi-is-not-up-F.patch
+++ b/patches/frameworks/opt/telephony/0002-Allow-LocaleTracker-to-work-even-if-wifi-is-not-up-F.patch
@@ -1,4 +1,4 @@
-From a04735c181e6212d3a31c47e7b984163a5df0a70 Mon Sep 17 00:00:00 2001
+From d4c7fb7f3d8193ea8680942169f396e93ccd71bf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:39:39 +0200
 Subject: [PATCH 2/2] Allow LocaleTracker to work even if wifi is not up (FDE)
@@ -9,7 +9,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/java/com/android/internal/telephony/LocaleTracker.java b/src/java/com/android/internal/telephony/LocaleTracker.java
-index 996e288..263d7e5 100644
+index 996e288dc..263d7e572 100644
 --- a/src/java/com/android/internal/telephony/LocaleTracker.java
 +++ b/src/java/com/android/internal/telephony/LocaleTracker.java
 @@ -408,8 +408,8 @@ public class LocaleTracker extends Handler {
@@ -24,5 +24,5 @@
      }
  
 -- 
-2.7.4
+2.17.1