[linux-next] LinuxNextTracking branch, master, updated. next-20180529

batman at open-mesh.org batman at open-mesh.org
Wed May 30 00:17:33 CEST 2018

The following commit has been merged in the master branch:
commit 6bf9e4d39a582a4beea1844d6955cb2ebc979a67
Author: Luc Van Oostenryck <luc.vanoostenryck at 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 at gmail.com>
    [sven at narfation.org: fixed alignment]
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 67065e35de51..1485263a348b 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);


More information about the linux-merge mailing list