merge stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Fri, 18 Dec 2015 12:30:45 +0100
branchstable-1.5
changeset 2632 08aa7305b9ba
parent 2599 4b0b906df1b4 (current diff)
parent 2631 827abf3c50de (diff)
child 2639 3bedfc5ecd74
merge
--- 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;
     }
--- 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;