Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 988f5b2d1a660636633e477c20ec24f6e471731e Author: Antonio Quartulli ordex@autistici.org Date: Wed Feb 20 15:57:31 2013 +0100

batman-adv: add compat support for the new netlink ops

This patches enable the new rtnl ops to compile on kernels starting from 2.6.32

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de Tested-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

988f5b2d1a660636633e477c20ec24f6e471731e compat.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

diff --git a/compat.h b/compat.h index 425b3d9..23ced4a 100644 --- a/compat.h +++ b/compat.h @@ -71,6 +71,9 @@ static inline void batadv_this_cpu_add(uint64_t *count_ptr, size_t count) put_cpu(); }

+#define batadv_softif_destroy_netlink(dev, head) batadv_softif_destroy_netlink(dev) +#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) + #endif /* < KERNEL_VERSION(2, 6, 33) */

@@ -132,6 +135,24 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol

+#define batadv_softif_slave_add(x, y) \ +batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ +{\ + return -EOPNOTSUPP;\ +}\ +static int __attribute__((unused)) __batadv_softif_slave_add(x, y) + +#define batadv_softif_slave_del(x, y) \ +__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ +static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ +{\ + return -EOPNOTSUPP;\ +}\ +static int __attribute__((unused)) __batadv_softif_slave_del(x, y) + +#define ndo_add_slave ndo_do_ioctl +#define ndo_del_slave ndo_do_ioctl + #endif /* < KERNEL_VERSION(2, 6, 39) */