From 05f48d1e40e55097ac960dc2a8a50d594cf967a8 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Wed, 18 Feb 2015 21:44:02 +0800 Subject: [PATCH 3/3] remove ndo workarounds --- compat.h | 14 -------------- soft-interface.c | 2 -- 2 files changed, 16 deletions(-) diff --git a/compat.h b/compat.h index 27d8a21..c3796a8 100644 --- a/compat.h +++ b/compat.h @@ -191,20 +191,6 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol -/* Hack for removing ndo_add/del_slave at the end of net_device_ops. - * This is somewhat ugly because it requires that ndo_validate_addr - * is at the end of this struct in soft-interface.c. - */ -#define ndo_validate_addr \ - ndo_validate_addr = eth_validate_addr, \ -}; \ -static const struct { \ - void *ndo_validate_addr; \ - void *ndo_add_slave; \ - void *ndo_del_slave; \ -} __attribute__((unused)) __useless_ops1 = { \ - .ndo_validate_addr - #define ndo_del_slave ndo_init #define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EBUSY diff --git a/soft-interface.c b/soft-interface.c index 8748987..a73ebd0 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -874,8 +874,6 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_set_rx_mode = batadv_interface_set_rx_mode, .ndo_start_xmit = batadv_interface_tx, .ndo_validate_addr = eth_validate_addr, - .ndo_add_slave = batadv_softif_slave_add, - .ndo_del_slave = batadv_softif_slave_del, }; /** -- 2.1.4