From 68a5b3e671606a5fb7ce5981fdccc7e71d552f41 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Jun 2019 07:57:26 +0200 Subject: [PATCH] 4.19-stable patches added patches: ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch --- ...p_noref-when-config_inet-is-disabled.patch | 46 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-4.19/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch diff --git a/queue-4.19/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch b/queue-4.19/ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch new file mode 100644 index 00000000000..3b4db6a79eb --- /dev/null +++ b/queue-4.19/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 +Date: Sun, 5 May 2019 11:16:20 -0700 +Subject: ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled + +From: David Ahern + +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 +Signed-off-by: David Ahern +Signed-off-by: David S. Miller +Cc: Nobuhiro Iwamatsu +Signed-off-by: Greg Kroah-Hartman + +--- + 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-4.19/series b/queue-4.19/series index abcfff07045..355163788f2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -49,3 +49,4 @@ drm-i915-maintain-consistent-documentation-subsection-ordering.patch drm-don-t-block-fb-changes-for-async-plane-updates.patch drm-i915-gvt-initialize-intel_gvt_gtt_entry-in-stack.patch tty-serial_core-add-install.patch +ipv4-define-__ipv4_neigh_lookup_noref-when-config_inet-is-disabled.patch -- 2.47.3