Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-06-10 12:54:54 +0200
committerJiri Slaby <jslaby@suse.cz>2019-06-10 12:54:54 +0200
commit11184fffbd6f7ef27b6f2566362a27c4fc912a31 (patch)
tree7c04a2ca431d055a37f684f70a1366242559f213
parent5fba04a0fee49164112791f468ff6fda779b3e4d (diff)
ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is
disabled (git-fixes).
-rw-r--r--patches.suse/ipv4-Define-__ipv4_neigh_lookup_noref-when-CONFIG_IN.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.suse/ipv4-Define-__ipv4_neigh_lookup_noref-when-CONFIG_IN.patch b/patches.suse/ipv4-Define-__ipv4_neigh_lookup_noref-when-CONFIG_IN.patch
new file mode 100644
index 0000000000..179ff0392e
--- /dev/null
+++ b/patches.suse/ipv4-Define-__ipv4_neigh_lookup_noref-when-CONFIG_IN.patch
@@ -0,0 +1,42 @@
+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
+Git-commit: 9b3040a6aafd7898ece7fc7efcbca71e42aa8069
+Patch-mainline: v5.2-rc1
+References: git-fixes
+
+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>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ include/net/arp.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/include/net/arp.h
++++ b/include/net/arp.h
+@@ -17,6 +17,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))
+@@ -24,6 +25,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/series.conf b/series.conf
index 4a50aa072b..0aa45319c0 100644
--- a/series.conf
+++ b/series.conf
@@ -22109,6 +22109,7 @@
patches.drivers/brcm80211-potential-NULL-dereference-in-brcmf_cfg802.patch
patches.drivers/net-ena-fix-return-value-of-ena_com_config_llq_info.patch
patches.suse/neighbor-Call-__ipv4_neigh_lookup_noref-in-neigh_xmi.patch
+ patches.suse/ipv4-Define-__ipv4_neigh_lookup_noref-when-CONFIG_IN.patch
patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch
patches.drivers/usb-storage-Set-virt_boundary_mask-to-avoid-SG-overf.patch
patches.drivers/USB-cdc-acm-fix-unthrottle-races.patch