---

yaml --- r: 255679 b: refs/heads/master c: 21e8425 h: refs/heads/master i: 255677: 1d38565 255675: c486c8e 255671: b56d0a5 255663: fe5a088 255647: dd7cf0d 255615: dfa3321 v: v3
git-mirror · Jun 24, 2011 · b2aaf3b · b2aaf3b
1 parent 60b8ec6
commit b2aaf3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a38a104d7af27b7697bf7c4272f4be5d1ec6ef4c
+refs/heads/master: 21e842579a5fd1ce746be4e34ac53ef67d6f0a6b
diff --git a/trunk/include/net/ip.h b/trunk/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)
 {