From 82bdf3d9fd66c4b18b83341678263d0b9cbb8e37 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 23 Jun 2011 21:28:52 -0700
Subject: [PATCH] --- yaml --- r: 255667 b: refs/heads/master c:
 d18cd551d15b38153ca3641c17ee8590a54b4c7b h: refs/heads/master i:   255665:
 536f6a08216065165c918213a58e09bb5a701a77   255663:
 fe5a0888091690cc4349d8572ee60a5b425867b1 v: v3

---
 [refs]                 |  2 +-
 trunk/include/net/ip.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 573106acd43d..52ddda3d018e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d054f2f1445aceedab3f9642692d55d2caa7ec6
+refs/heads/master: d18cd551d15b38153ca3641c17ee8590a54b4c7b
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index d603cd329c4e..9fa9416d14d7 100644
--- 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)
 {