From: David S. Miller <davem@davemloft.net>
Date: Fri, 24 Jun 2011 04:28:52 +0000 (-0700)
Subject: net: Fix build failures due to ip_is_fragment()
X-Git-Tag: firefly_0821_release~3680^2~5008^2~360
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d18cd551d15b38153ca3641c17ee8590a54b4c7b;p=firefly-linux-kernel-4.4.55.git

net: Fix build failures due to ip_is_fragment()

It needs to be available even when CONFIG_INET is not set.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ip.h b/include/net/ip.h
index d603cd329c4e..9fa9416d14d7 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -236,6 +236,11 @@ extern void ipfrag_init(void);
 
 extern void ip_static_sysctl_init(void);
 
+static inline bool ip_is_fragment(const struct iphdr *iph)
+{
+	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
+}
+
 #ifdef CONFIG_INET
 #include <net/dst.h>
 
@@ -250,11 +255,6 @@ int ip_decrease_ttl(struct iphdr *iph)
 	return --iph->ttl;
 }
 
-static inline bool ip_is_fragment(const struct iphdr *iph)
-{
-	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
-}
-
 static inline
 int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)
 {