[linux-next] LinuxNextTracking branch, master, updated. next-20190329

batman at open-mesh.org batman at open-mesh.org
Sat Mar 30 00:19:31 CET 2019


The following commit has been merged in the master branch:
commit 438b3d3fae4346a49fe12fa7cc1dc9327f006a91
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 3 19:25:26 2019 +0100

    batman-adv: Fix genl notification for throughput_override
    
    The throughput_override sysfs file is not below the meshif but below a
    hardif. The kobj has therefore not a pointer which can be used to find the
    batadv_priv data. The pointer stored in the hardif object must be used
    instead to find the correct meshif private data.
    
    Fixes: 7e6f461efe25 ("batman-adv: Trigger genl notification on sysfs config change")
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index 0b4b3fb778a6..208655cf6717 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -1116,9 +1116,9 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj,
 						struct attribute *attr,
 						char *buff, size_t count)
 {
-	struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
 	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
 	struct batadv_hard_iface *hard_iface;
+	struct batadv_priv *bat_priv;
 	u32 tp_override;
 	u32 old_tp_override;
 	bool ret;
@@ -1147,7 +1147,10 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj,
 
 	atomic_set(&hard_iface->bat_v.throughput_override, tp_override);
 
-	batadv_netlink_notify_hardif(bat_priv, hard_iface);
+	if (hard_iface->soft_iface) {
+		bat_priv = netdev_priv(hard_iface->soft_iface);
+		batadv_netlink_notify_hardif(bat_priv, hard_iface);
+	}
 
 out:
 	batadv_hardif_put(hard_iface);

-- 
LinuxNextTracking


More information about the linux-merge mailing list