Hey guys, As requested, just did a quick test again: * batctl if add $iface && some OGMS here && batctl if del $iface --> still works fine * batctl link add dev bat0 type batadv --> creates the bat0 interface * ip link set dev eth0 master bat0 --> no output, no effect * ip link del dev bat0 --> deletes the bat0 interface
Used: Debian stable (squeeze) with original kernel (linux-iamge-2.6.32-5-686,
version 2.6.32-46)
batctl (2012.1.0-1) and iproute (20120521-3) from wheezy
So no difference noticed here. :)
I've checked back with iproute package from squeeze (20120521-3):
* "ip link add dev bat0 type batadv" still works
* "ip link set dev eth0 master bat0" throws an error and does nothing:
Error: either "dev" is duplicate, or "master" is a garbage.
so to summarize: it compiles again, batctl works, and ip at least allows to add
the bat0
interface but adding interfaces into a softiface using ip doesn't.
Hope that helps!
Cheers,
Simon
Tested-by: Simon Wunderlich <s...@hrz.tu-chemnitz.de>
On Wed, Feb 20, 2013 at 03:57:31PM +0100, Antonio Quartulli wrote:
> This patches enable the new rtnl ops to compile on kernels starting from
> 2.6.32
>
> Signed-off-by: Antonio Quartulli <or...@autistici.org>
> ---
>
> v2:
> - do not handle ioctl. just return EOPNOTSUPP
>
> 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) */
>
>
> --
> 1.8.1.2
>
signature.asc
Description: Digital signature
