From: hartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Date: Thu, 1 Sep 2011 09:43:16 +0000 (+0000)
Subject: Add kernel version depency for Kernel 3.1.x which extended __rtnl_register().
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/7242dfaaacd11619e0ab730d9e9601112e97c05a

Add kernel version depency for Kernel 3.1.x which extended __rtnl_register().


git-svn-id: svn://svn.berlios.de//socketcan/trunk@1271 030b6a49-0b11-0410-94ab-b0dab22257f2
---

diff --git a/kernel/2.6/net/can/gw.c b/kernel/2.6/net/can/gw.c
index d7257cc..0c9f869 100644
--- a/kernel/2.6/net/can/gw.c
+++ b/kernel/2.6/net/can/gw.c
@@ -936,15 +936,24 @@ static __init int cgw_module_init(void)
 	notifier.notifier_call = cgw_notifier;
 	register_netdevice_notifier(&notifier);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
+	if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
+#else
 	if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs)) {
+#endif
 		unregister_netdevice_notifier(&notifier);
 		kmem_cache_destroy(cgw_cache);
 		return -ENOBUFS;
 	}
 
 	/* Only the first call to __rtnl_register can fail */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
+	__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, NULL);
+	__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL, NULL);
+#else
 	__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL);
 	__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL);
+#endif
 
 	return 0;
 }