aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ip.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-24 00:28:52 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-24 00:28:52 -0400
commitd18cd551d15b38153ca3641c17ee8590a54b4c7b (patch)
treee99166ff3bec79fd6f7025a55c4cd5e0431f7faa /include/net/ip.h
parent4d054f2f1445aceedab3f9642692d55d2caa7ec6 (diff)
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>
Diffstat (limited to 'include/net/ip.h')
-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);
236 236
237extern void ip_static_sysctl_init(void); 237extern void ip_static_sysctl_init(void);
238 238
239static inline bool ip_is_fragment(const struct iphdr *iph)
240{
241 return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
242}
243
239#ifdef CONFIG_INET 244#ifdef CONFIG_INET
240#include <net/dst.h> 245#include <net/dst.h>
241 246
@@ -250,11 +255,6 @@ int ip_decrease_ttl(struct iphdr *iph)
250 return --iph->ttl; 255 return --iph->ttl;
251} 256}
252 257
253static inline bool ip_is_fragment(const struct iphdr *iph)
254{
255 return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
256}
257
258static inline 258static inline
259int ip_dont_fragment(struct sock *sk, struct dst_entry *dst) 259int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)
260{ 260{