Merge "modify vr_compat.h to compile on centos 6.5 and later" into R2.0

Juniper · Apr 20, 2015 · 930f9fa · 930f9fa
2 parents 0d1e812 + 0fc4a0b
commit 930f9fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/vr_compat.h b/include/vr_compat.h
@@ -9,7 +9,7 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0))
 #if (! (defined(RHEL_MAJOR) && defined(RHEL_MINOR)  && \
-           (RHEL_MAJOR == 6) && (RHEL_MINOR == 5)))
+           (RHEL_MAJOR == 6) && (RHEL_MINOR >= 5)))
 typedef u64 netdev_features_t;
 #endif
 #endif
@@ -139,7 +139,7 @@ static inline void skb_reset_mac_len(struct sk_buff *skb)
 
 #ifndef ISRHOSKERNEL
 #if (! (defined(RHEL_MAJOR) && defined(RHEL_MINOR)  && \
-           (RHEL_MAJOR == 6) && (RHEL_MINOR == 5)))
+           (RHEL_MAJOR == 6) && (RHEL_MINOR >= 5)))
 static bool can_checksum_protocol(netdev_features_t features, __be16 protocol)
 {
         return ((features & NETIF_F_GEN_CSUM) ||