From b2aaf3bbeeaa74645fa41f4707a83d7dfeb18556 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 23 Jun 2011 23:39:33 -0700
Subject: [PATCH] --- yaml --- r: 255679 b: refs/heads/master c:
 21e842579a5fd1ce746be4e34ac53ef67d6f0a6b h: refs/heads/master i:   255677:
 1d38565918a35ae85dbc9da715a58cd9fd2bd449   255675:
 c486c8ebd8687e17e3550d6d7f67ad8339853fb6   255671:
 b56d0a5c4485f2ecc49405ef9ea87a8fcb6f1e6d   255663:
 fe5a0888091690cc4349d8572ee60a5b425867b1   255647:
 dd7cf0dc694c5d4bcec92da76e05d88dd12df067   255615:
 dfa332155cdf8f2c8d114802e6766fce07a49cab v: v3

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

diff --git a/[refs] b/[refs]
index 0efe240e47d4..b52f31e2e7ec 100644
--- 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
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)
 {