diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2018-04-24 15:18:46 +0200 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2018-04-25 19:33:36 +0200 |
| commit | 6bf9e4d39a582a4beea1844d6955cb2ebc979a67 (patch) | |
| tree | e7b09218e6124cce3b7074f79f9f64210c634024 /net/batman-adv/soft-interface.c | |
| parent | dc06338df9a8443dcff6c7be03ab792ea682d9ab (diff) | |
| download | linux-6bf9e4d39a582a4beea1844d6955cb2ebc979a67.tar.bz2 | |
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>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |