summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-23 21:28:52 -0700
committerDavid S. Miller <davem@davemloft.net>2011-06-23 21:28:52 -0700
commitd18cd551d15b38153ca3641c17ee8590a54b4c7b (patch)
treee99166ff3bec79fd6f7025a55c4cd5e0431f7faa
parent4d054f2f1445aceedab3f9642692d55d2caa7ec6 (diff)
downloadlinux-3.10-d18cd551d15b38153ca3641c17ee8590a54b4c7b.tar.gz
linux-3.10-d18cd551d15b38153ca3641c17ee8590a54b4c7b.tar.bz2
linux-3.10-d18cd551d15b38153ca3641c17ee8590a54b4c7b.zip
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>
-rw-r--r--include/net/ip.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index d603cd329c4..9fa9416d14d 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)
{