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

On branch : master

commit 615d4dd34ea5d9e4e30a9cbf8920375a067cc5c2 Author: Luc Van Oostenryck luc.vanoostenryck@gmail.com Date: Tue Apr 24 15:18:46 2018 +0200

batman-adv: fix batadv_interface_tx()'s return type

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too.

Signed-off-by: Luc Van Oostenryck luc.vanoostenryck@gmail.com [sven@narfation.org: fixed alignment] Signed-off-by: Sven Eckelmann sven@narfation.org

615d4dd34ea5d9e4e30a9cbf8920375a067cc5c2 net/batman-adv/soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 67065e3..1485263 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -188,8 +188,8 @@ static void batadv_interface_set_rx_mode(struct net_device *dev) { }

-static int batadv_interface_tx(struct sk_buff *skb, - struct net_device *soft_iface) +static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, + struct net_device *soft_iface) { struct ethhdr *ethhdr; struct batadv_priv *bat_priv = netdev_priv(soft_iface);