From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Thu, 21 May 2015 12:51:36 +0000 (+0300)
Subject: compat-3.1.h: Avoid ip_is_fragment redefinition
X-Git-Tag: vofed-3.18~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c633c3aacb2206f337c95a5ed72b83a8750fc966;p=~emulex%2Ftmp%2Fcompat%2F.git

compat-3.1.h: Avoid ip_is_fragment redefinition

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/include/linux/compat-3.1.h b/include/linux/compat-3.1.h
index 7b05951..b5282ad 100644
--- a/include/linux/compat-3.1.h
+++ b/include/linux/compat-3.1.h
@@ -29,6 +29,7 @@ static inline struct neighbour *dst_get_neighbour_raw(struct dst_entry *dst)
 #endif /* HAVE_DST_GET_NEIGHBOUR */
 
 /* Backports 56f8a75c */
+#define ip_is_fragment LINUX_BACKPORT(ip_is_fragment)
 static inline bool ip_is_fragment(const struct iphdr *iph)
 {
 	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;