From 52daacc5c486daa38989883dc74618e758a33e4f Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 21 Oct 2015 18:48:32 +0200
Subject: [PATCH] kernel: update to 3.14.54

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 lfs/linux                                     | 19 +++++++++++--------
 .../linux-3.14.54_fix_ip_route_list.patch     | 12 ++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 src/patches/linux-3.14.54_fix_ip_route_list.patch

diff --git a/lfs/linux b/lfs/linux
index fe74ad1e11..85b4060d3f 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER         = 3.14.53
-RPI_PATCHES = 3.14.53-grsec-ipfire1
-A7M_PATCHES = 3.14.53-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1ipfire-3.14.53-v1.patch.xz
+VER         = 3.14.54
+RPI_PATCHES = 3.14.54-grsec-ipfire1
+A7M_PATCHES = 3.14.54-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1ipfire-3.14.54-v1.patch.xz
 
 
 THISAPP    = linux-$(VER)
@@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz		= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz	= $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)					= $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5					= 5c5d18ddcc80b008826c2f43b322a34a
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= de5350ee7c3e4aa82289916963796fd9
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 25fc733bb657a84eea338104f88bcf70
-$(GRS_PATCHES)_MD5				= 4c1f6e73f04bfc92b105afff24d0308c
+$(DL_FILE)_MD5					= 61a0568abd96bef9b682d0d46977fbdd
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= db92bc85979895efdc6d9da2877ce0ae
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 9092711bcac325c5d0dac5eed98f1c5d
+$(GRS_PATCHES)_MD5				= 0c1e505cf87177bfb7d62c95e67f10ef
 
 install : $(TARGET)
 
@@ -134,6 +134,9 @@ ifneq "$(KCFG)" "-headers"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
 endif
 
+	# Fix ip route list hang introduced with linux 3.14.54
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.54_fix_ip_route_list.patch
+
 	# DVB Patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch
 	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
diff --git a/src/patches/linux-3.14.54_fix_ip_route_list.patch b/src/patches/linux-3.14.54_fix_ip_route_list.patch
new file mode 100644
index 0000000000..6613d15336
--- /dev/null
+++ b/src/patches/linux-3.14.54_fix_ip_route_list.patch
@@ -0,0 +1,12 @@
+diff -Naur a/net/core/fib_rules.c b/net/core/fib_rules.c
+--- a/net/core/fib_rules.c	2015-10-19 16:40:32.000000000 +0200
++++ b/net/core/fib_rules.c	2015-10-19 16:54:37.836777983 +0200
+@@ -631,7 +631,7 @@
+ 		err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid,
+ 				       cb->nlh->nlmsg_seq, RTM_NEWRULE,
+ 				       NLM_F_MULTI, ops);
+-		if (err)
++		if (err < 0)
+ 			break;
+ skip:
+ 		idx++;
-- 
2.39.5