The following commit has been merged in the master branch: commit 13b0ea0f5934ac30bf75c21554d3061b02abbad4 Author: Tobias Klauser tklauser@distanz.ch Date: Fri Mar 17 12:08:59 2017 +0100

batman-adv: Omit unnecessary memset of netdev private data

The memory for netdev_priv is allocated using kzalloc in alloc_netdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again.

Signed-off-by: Tobias Klauser tklauser@distanz.ch Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5d099b2..8226495 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -972,8 +972,6 @@ static void batadv_softif_free(struct net_device *dev) */ static void batadv_softif_init_early(struct net_device *dev) { - struct batadv_priv *priv = netdev_priv(dev); - ether_setup(dev);

dev->netdev_ops = &batadv_netdev_ops; @@ -990,8 +988,6 @@ static void batadv_softif_init_early(struct net_device *dev) eth_hw_addr_random(dev);

dev->ethtool_ops = &batadv_ethtool_ops; - - memset(priv, 0, sizeof(*priv)); }

struct net_device *batadv_softif_create(struct net *net, const char *name)