Merge "Update skb_get_rxhash to handle rhel70" into R2.1

Juniper · Mar 27, 2015 · e20b410 · e20b410
2 parents b90b14a + 041192c
commit e20b410
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/vr_compat.h b/include/vr_compat.h
@@ -24,8 +24,9 @@ typedef u64 netdev_features_t;
  *
  * #define skb_get_rxhash skb_get_hash
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,11)) && \
-                           !(defined(skb_get_rxhash))
+#if (((LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,11)) && \
+                           !(defined(skb_get_rxhash))) || \
+                           (defined(RHEL_MAJOR) && (RHEL_MAJOR >= 7)))
 static inline __u32
 skb_get_rxhash(struct sk_buff *skb)
 {

diff --git a/linux/vr_genetlink.c b/linux/vr_genetlink.c
@@ -169,7 +169,8 @@ vr_genetlink_init(void)
     if (ret)
         return ret;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
+#if ((LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)) && \
+     (!(defined(RHEL_MAJOR) && (RHEL_MAJOR >= 7))))
     return genl_register_family_with_ops(&vrouter_genl_family, vrouter_genl_ops,
         ARRAY_SIZE(vrouter_genl_ops));
 #else