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 @@ -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) {