backports: do not backport netif_set_real_num_rx_queues() on RHEL 6.4

The in kernel version of netif_set_real_num_rx_queues() on RHEL 6.4
accesses some other struct members than our backported version. We
should use that version instead.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index e405c6c1612d156f7bd876e6b124696630ad5405..aa1dcd69579b5c926a4e5dc08deebdc1dd5affdb 100644 (file)
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -233,6 +233,7 @@ static inline int register_netdevice_name(struct net_device *dev)
 #define net_ns_type_operations LINUX_BACKPORT(net_ns_type_operations)
 extern struct kobj_ns_type_operations net_ns_type_operations;
 
+#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4))
 #ifdef CONFIG_RPS
 extern int netif_set_real_num_rx_queues(struct net_device *dev,
                                        unsigned int rxq);
@@ -243,6 +244,7 @@ static inline int netif_set_real_num_rx_queues(struct net_device *dev,
        return 0;
 }
 #endif
+#endif
 #endif /* < 2.6.37 */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)

diff --git a/backport/compat/compat-2.6.35.c b/backport/compat/compat-2.6.35.c
index cd556d35f581b02be2a25225f03ab3cdf0cb5382..f6e2672fd4f2c39b9b5ce3950c58d2d6dcfe6369 100644 (file)
--- a/backport/compat/compat-2.6.35.c
+++ b/backport/compat/compat-2.6.35.c
@@ -17,6 +17,7 @@
 #include <linux/uaccess.h>
 #include <net/sch_generic.h>
 
+#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4))
 #ifdef CONFIG_RPS
 int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
 {
@@ -29,6 +30,7 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
        return 0;
 }
 #endif
+#endif
 
 /*
  * Routine to help set real_num_tx_queues. To avoid skbs mapped to queues