# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1450438245 -3600
# Node ID 08aa7305b9baba37bdd9eb4d8c2a8762aa56a7e2
# Parent  4b0b906df1b40a1b5610282117b2c22581890575# Parent  827abf3c50de5d7d523f7bcfa5ed5e50b4f1b130
merge

diff -r 4b0b906df1b4 -r 08aa7305b9ba devices/generic.c
--- a/devices/generic.c	Thu Feb 19 15:19:29 2015 +0100
+++ b/devices/generic.c	Fri Dec 18 12:30:45 2015 +0100
@@ -149,7 +149,12 @@
     dev->socket = NULL;
     dev->rx_buf = NULL;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
+    dev->netdev = alloc_netdev(sizeof(ec_gen_device_t *), &null,
+            NET_NAME_UNKNOWN, ether_setup);
+#else
     dev->netdev = alloc_netdev(sizeof(ec_gen_device_t *), &null, ether_setup);
+#endif
     if (!dev->netdev) {
         return -ENOMEM;
     }
diff -r 4b0b906df1b4 -r 08aa7305b9ba master/ethernet.c
--- a/master/ethernet.c	Thu Feb 19 15:19:29 2015 +0100
+++ b/master/ethernet.c	Fri Dec 18 12:30:45 2015 +0100
@@ -148,7 +148,13 @@
 
     snprintf(eoe->datagram.name, EC_DATAGRAM_NAME_SIZE, name);
 
-    if (!(eoe->dev = alloc_netdev(sizeof(ec_eoe_t *), name, ether_setup))) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
+    eoe->dev = alloc_netdev(sizeof(ec_eoe_t *), name, NET_NAME_UNKNOWN,
+            ether_setup);
+#else
+    eoe->dev = alloc_netdev(sizeof(ec_eoe_t *), name, ether_setup);
+#endif
+    if (!eoe->dev) {
         EC_SLAVE_ERR(slave, "Unable to allocate net_device %s"
                 " for EoE handler!\n", name);
         ret = -ENODEV;