The following commit has been merged in the master branch: commit e73f94d1b6f05f6f22434c63de255a9dec6fd23d Author: YueHaibing yuehaibing@huawei.com Date: Fri Apr 24 21:14:37 2020 +0800

batman-adv: remove unused inline function batadv_arp_change_timeout

There's no callers in-tree.

Signed-off-by: YueHaibing yuehaibing@huawei.com Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 2bff2f4a325c..4e031661682a 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -163,11 +163,6 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv, { }

-static inline void batadv_arp_change_timeout(struct net_device *soft_iface, - const char *name) -{ -} - static inline int batadv_dat_init(struct batadv_priv *bat_priv) { return 0;