The following commit has been merged in the master branch: commit 00f548bf5494ade996ae9c5e85c497dd2a3fdad5 Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Feb 18 22:17:30 2015 +0800

batman-adv: checkpatch - comparison to NULL could be rewritten

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 9426b83..50cf722 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -818,7 +818,7 @@ static int batadv_softif_slave_add(struct net_device *dev, int ret = -EINVAL;

hard_iface = batadv_hardif_get_by_netdev(slave_dev); - if (!hard_iface || hard_iface->soft_iface != NULL) + if (!hard_iface || hard_iface->soft_iface) goto out;

ret = batadv_hardif_enable_interface(hard_iface, dev->name);