From 621241b39406d77d832064bdacb401522fea743c Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Thu, 7 May 2015 15:53:42 +0200 Subject: [PATCH] New alloc_netdev() API since kernel 3.17. --- devices/generic.c | 5 +++++ master/ethernet.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devices/generic.c b/devices/generic.c index 9c03878c..63c4aba2 100644 --- a/devices/generic.c +++ b/devices/generic.c @@ -149,7 +149,12 @@ int ec_gen_device_init( 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 --git a/master/ethernet.c b/master/ethernet.c index ad361d3d..57873e5d 100644 --- a/master/ethernet.c +++ b/master/ethernet.c @@ -176,7 +176,13 @@ int ec_eoe_init( 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;