From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Jun 2019 05:57:41 +0000 (+0200)
Subject: 5.1-stable patches
X-Git-Tag: v5.1.9~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b387901f952c98cb3d759b657ed63d68968abff9;p=thirdparty%2Fkernel%2Fstable-queue.git

5.1-stable patches

added patches:
	ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch
---

diff --git a/queue-5.1/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch b/queue-5.1/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch
new file mode 100644
index 00000000000..3b4db6a79eb
--- /dev/null
+++ b/queue-5.1/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch
@@ -0,0 +1,46 @@
+From 9b3040a6aafd7898ece7fc7efcbca71e42aa8069 Mon Sep 17 00:00:00 2001
+From: David Ahern <dsahern@gmail.com>
+Date: Sun, 5 May 2019 11:16:20 -0700
+Subject: ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled
+
+From: David Ahern <dsahern@gmail.com>
+
+commit 9b3040a6aafd7898ece7fc7efcbca71e42aa8069 upstream.
+
+Define __ipv4_neigh_lookup_noref to return NULL when CONFIG_INET is disabled.
+
+Fixes: 4b2a2bfeb3f0 ("neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit")
+Reported-by: kbuild test robot <lkp@intel.com>
+Signed-off-by: David Ahern <dsahern@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/net/arp.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/include/net/arp.h
++++ b/include/net/arp.h
+@@ -18,6 +18,7 @@ static inline u32 arp_hashfn(const void
+ 	return val * hash_rnd[0];
+ }
+ 
++#ifdef CONFIG_INET
+ static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev, u32 key)
+ {
+ 	if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
+@@ -25,6 +26,13 @@ static inline struct neighbour *__ipv4_n
+ 
+ 	return ___neigh_lookup_noref(&arp_tbl, neigh_key_eq32, arp_hashfn, &key, dev);
+ }
++#else
++static inline
++struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev, u32 key)
++{
++	return NULL;
++}
++#endif
+ 
+ static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key)
+ {
diff --git a/queue-5.1/series b/queue-5.1/series
index 547be8b5b3f..9fc96f128ff 100644
--- a/queue-5.1/series
+++ b/queue-5.1/series
@@ -68,3 +68,4 @@ drm-don-t-block-fb-changes-for-async-plane-updates.patch
 drm-i915-gvt-initialize-intel_gvt_gtt_entry-in-stack.patch
 drm-amd-fix-fb-references-in-async-update.patch
 tty-serial_core-add-install.patch
+ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch