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