Merge tag 'batadv-next-for-davem-20200526' of git://git.open-mesh.org/linux-merge (fb8ddaa9) · Commits · 戴 / test

net/batman-adv/bat_v_elp.c

+1 −14

Original line number	Diff line number	Diff line
		@@ -127,20 +127,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
		rtnl_lock();
		ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);
		rtnl_unlock();

		/* Virtual interface drivers such as tun / tap interfaces, VLAN, etc
		* tend to initialize the interface throughput with some value for the
		* sake of having a throughput number to export via ethtool. This
		* exported throughput leaves batman-adv to conclude the interface
		* throughput is genuine (reflecting reality), thus no measurements
		* are necessary.
		*
		* Based on the observation that those interface types also tend to set
		* the link auto-negotiation to 'off', batman-adv shall check this
		* setting to differentiate between genuine link throughput information
		* and placeholders installed by virtual interfaces.
		*/
		if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) {
		if (ret == 0) {
		/* link characteristics might change over time */
		if (link_settings.base.duplex == DUPLEX_FULL)
		hard_iface->bat_v.flags \|= BATADV_FULL_DUPLEX;

+2 −2

Original line number	Diff line number	Diff line
		@@ -146,8 +146,8 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,
		if (new_gw_node)
		kref_get(&new_gw_node->refcount);

		curr_gw_node = rcu_dereference_protected(bat_priv->gw.curr_gw, 1);
		rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node);
		curr_gw_node = rcu_replace_pointer(bat_priv->gw.curr_gw, new_gw_node,
		true);

		if (curr_gw_node)
		batadv_gw_node_put(curr_gw_node);

+2 −2

Original line number	Diff line number	Diff line
		@@ -473,8 +473,8 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,
		if (new_hard_iface)
		kref_get(&new_hard_iface->refcount);

		curr_hard_iface = rcu_dereference_protected(bat_priv->primary_if, 1);
		rcu_assign_pointer(bat_priv->primary_if, new_hard_iface);
		curr_hard_iface = rcu_replace_pointer(bat_priv->primary_if,
		new_hard_iface, 1);

		if (!new_hard_iface)
		goto out;

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,13 +71,13 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
		* the code needs to ensure the curr_router variable contains a pointer
		* to the replaced best neighbor.
		*/
		curr_router = rcu_dereference_protected(orig_ifinfo->router, true);

		/* increase refcount of new best neighbor */
		if (neigh_node)
		kref_get(&neigh_node->refcount);

		rcu_assign_pointer(orig_ifinfo->router, neigh_node);
		curr_router = rcu_replace_pointer(orig_ifinfo->router, neigh_node,
		true);
		spin_unlock_bh(&orig_node->neigh_list_lock);
		batadv_orig_ifinfo_put(orig_ifinfo);

+1 −0