batman-adv: Fix double call of dev_queue_xmit
authorSven Eckelmann <sven@narfation.org>
Sat, 28 Jan 2017 09:12:39 +0000 (10:12 +0100)
committerSimon Wunderlich <sw@simonwunderlich.de>
Sat, 28 Jan 2017 09:40:35 +0000 (10:40 +0100)
commit7c946062b3ae2b7f002383e5e402113e98ad3c77
tree03db0aab75359f626c79d66553331a3aee6d3823
parentc33705188c493b7de3b8dc2956d67de91b444727
batman-adv: Fix double call of dev_queue_xmit

The net_xmit_eval has side effects because it is not making sure that e
isn't evaluated twice.

    #define net_xmit_eval(e)        ((e) == NET_XMIT_CN ? 0 : (e))

The code requested by David Miller [1]

    return net_xmit_eval(dev_queue_xmit(skb));

will get transformed into

    return ((dev_queue_xmit(skb)) == NET_XMIT_CN ? 0 : (dev_queue_xmit(skb)))

dev_queue_xmit will therefore be tried again (with an already consumed skb)
whenever the return code is not NET_XMIT_CN.

[1] https://lkml.kernel.org/r/20170125.225624.965229145391320056.davem@davemloft.net

Fixes: c33705188c49 ("batman-adv: Treat NET_XMIT_CN as transmit successfully")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
net/batman-adv/send.c