X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b130fd7d9eca19bfc766c2211b76a892752e7db6..699212b7b42faa56e6ecbeaf36079f9ed2fe4640:/package/switch/src/switch-robo.c

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 95cb3e23f..206359d07 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -73,7 +73,7 @@
 extern char *nvram_get(const char *name);
 #define getvar(str) (nvram_get(str)?:"")
 #else
-#define getvar(str) NULL
+#define getvar(str) ""
 #endif
 
 /* Data structure for a Roboswitch device. */
@@ -101,7 +101,11 @@ static int do_ioctl(int cmd, void *buf)
 		robo.ifr.ifr_data = (caddr_t) buf;
 
 	set_fs(KERNEL_DS);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+	ret = robo.dev->netdev_ops->ndo_do_ioctl(robo.dev, &robo.ifr, cmd);
+#else
 	ret = robo.dev->do_ioctl(robo.dev, &robo.ifr, cmd);
+#endif
 	set_fs(old_fs);
 
 	return ret;