Merge tag 'batadv-next-pullrequest-20210608' of git://git.open-mesh.org/linux-merge (303597e4) · Commits · EulixOS / Software / Kernel

net/batman-adv/bat_iv_ogm.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1849,6 +1849,8 @@ batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,
	orig_node->orig) \|\|		orig_node->orig) \|\|
	nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,		nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,
	neigh_node->addr) \|\|		neigh_node->addr) \|\|
			nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
			neigh_node->if_incoming->net_dev->name) \|\|
	nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,		nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
	neigh_node->if_incoming->net_dev->ifindex) \|\|		neigh_node->if_incoming->net_dev->ifindex) \|\|
	nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) \|\|		nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) \|\|
	@@ -2078,6 +2080,8 @@ batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,

	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,		if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,
	hardif_neigh->addr) \|\|		hardif_neigh->addr) \|\|
			nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
			hardif_neigh->if_incoming->net_dev->name) \|\|
	nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,		nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
	hardif_neigh->if_incoming->net_dev->ifindex) \|\|		hardif_neigh->if_incoming->net_dev->ifindex) \|\|
	nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,		nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,
	@@ -2459,6 +2463,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid,
	router->addr) \|\|		router->addr) \|\|
	nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,		nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
	router->if_incoming->net_dev->name) \|\|		router->if_incoming->net_dev->name) \|\|
			nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
			router->if_incoming->net_dev->ifindex) \|\|
	nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,		nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,
	gw_node->bandwidth_down) \|\|		gw_node->bandwidth_down) \|\|
	nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP,		nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP,

net/batman-adv/bat_v.c

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,8 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,

	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,		if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,
	hardif_neigh->addr) \|\|		hardif_neigh->addr) \|\|
			nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
			hardif_neigh->if_incoming->net_dev->name) \|\|
	nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,		nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
	hardif_neigh->if_incoming->net_dev->ifindex) \|\|		hardif_neigh->if_incoming->net_dev->ifindex) \|\|
	nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,		nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,
	@@ -298,6 +300,8 @@ batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,
	if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node->orig) \|\|		if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node->orig) \|\|
	nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,		nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,
	neigh_node->addr) \|\|		neigh_node->addr) \|\|
			nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
			neigh_node->if_incoming->net_dev->name) \|\|
	nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,		nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
	neigh_node->if_incoming->net_dev->ifindex) \|\|		neigh_node->if_incoming->net_dev->ifindex) \|\|
	nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) \|\|		nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) \|\|
	@@ -739,6 +743,12 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid,
	goto out;		goto out;
	}		}

			if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,
			router->if_incoming->net_dev->ifindex)) {
			genlmsg_cancel(msg, hdr);
			goto out;
			}

	if (nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,		if (nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,
	gw_node->bandwidth_down)) {		gw_node->bandwidth_down)) {
	genlmsg_cancel(msg, hdr);		genlmsg_cancel(msg, hdr);

net/batman-adv/bridge_loop_avoidance.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -395,7 +395,7 @@ static void batadv_bla_send_claim(struct batadv_priv bat_priv, u8 mac,
	break;		break;
	case BATADV_CLAIM_TYPE_ANNOUNCE:		case BATADV_CLAIM_TYPE_ANNOUNCE:
	/* announcement frame		/* announcement frame
	* set HW SRC to the special mac containg the crc		* set HW SRC to the special mac containing the crc
	*/		*/
	ether_addr_copy(hw_src, mac);		ether_addr_copy(hw_src, mac);
	batadv_dbg(BATADV_DBG_BLA, bat_priv,		batadv_dbg(BATADV_DBG_BLA, bat_priv,
	@@ -1040,7 +1040,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,
	/* lets see if this originator is in our mesh */		/* lets see if this originator is in our mesh */
	orig_node = batadv_orig_hash_find(bat_priv, backbone_addr);		orig_node = batadv_orig_hash_find(bat_priv, backbone_addr);

	/* dont accept claims from gateways which are not in		/* don't accept claims from gateways which are not in
	* the same mesh or group.		* the same mesh or group.
	*/		*/
	if (!orig_node)		if (!orig_node)

net/batman-adv/bridge_loop_avoidance.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,6 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
	void batadv_bla_status_update(struct net_device *net_dev);		void batadv_bla_status_update(struct net_device *net_dev);
	int batadv_bla_init(struct batadv_priv *bat_priv);		int batadv_bla_init(struct batadv_priv *bat_priv);
	void batadv_bla_free(struct batadv_priv *bat_priv);		void batadv_bla_free(struct batadv_priv *bat_priv);
	int batadv_bla_claim_dump(struct sk_buff msg, struct netlink_callback cb);
	#ifdef CONFIG_BATMAN_ADV_DAT		#ifdef CONFIG_BATMAN_ADV_DAT
	bool batadv_bla_check_claim(struct batadv_priv bat_priv, u8 addr,		bool batadv_bla_check_claim(struct batadv_priv bat_priv, u8 addr,
	unsigned short vid);		unsigned short vid);

net/batman-adv/hard-interface.c

+4 −61

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@

	#include <linux/atomic.h>		#include <linux/atomic.h>
	#include <linux/byteorder/generic.h>		#include <linux/byteorder/generic.h>
	#include <linux/errno.h>
	#include <linux/gfp.h>		#include <linux/gfp.h>
	#include <linux/if.h>		#include <linux/if.h>
	#include <linux/if_arp.h>		#include <linux/if_arp.h>
	@@ -403,7 +402,7 @@ int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing,
	goto out;		goto out;
	}		}

	/* >1 neighbors -> (re)brodcast */		/* >1 neighbors -> (re)broadcast */
	if (rcu_dereference(hlist_next_rcu(first)))		if (rcu_dereference(hlist_next_rcu(first)))
	goto out;		goto out;

	@@ -677,44 +676,17 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)
	batadv_update_min_mtu(hard_iface->soft_iface);		batadv_update_min_mtu(hard_iface->soft_iface);
	}		}

	/**
	* batadv_master_del_slave() - remove hard_iface from the current master iface
	* @slave: the interface enslaved in another master
	* @master: the master from which slave has to be removed
	*
	* Invoke ndo_del_slave on master passing slave as argument. In this way the
	* slave is free'd and the master can correctly change its internal state.
	*
	* Return: 0 on success, a negative value representing the error otherwise
	*/
	static int batadv_master_del_slave(struct batadv_hard_iface *slave,
	struct net_device *master)
	{
	int ret;

	if (!master)
	return 0;

	ret = -EBUSY;
	if (master->netdev_ops->ndo_del_slave)
	ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev);

	return ret;
	}

	/**		/**
	* batadv_hardif_enable_interface() - Enslave hard interface to soft interface		* batadv_hardif_enable_interface() - Enslave hard interface to soft interface
	* @hard_iface: hard interface to add to soft interface		* @hard_iface: hard interface to add to soft interface
	* @net: the applicable net namespace		* @soft_iface: netdev struct of the mesh interface
	* @iface_name: name of the soft interface
	*		*
	* Return: 0 on success or negative error number in case of failure		* Return: 0 on success or negative error number in case of failure
	*/		*/
	int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,		int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
	struct net net, const char iface_name)		struct net_device *soft_iface)
	{		{
	struct batadv_priv *bat_priv;		struct batadv_priv *bat_priv;
	struct net_device soft_iface, master;
	__be16 ethertype = htons(ETH_P_BATMAN);		__be16 ethertype = htons(ETH_P_BATMAN);
	int max_header_len = batadv_max_header_len();		int max_header_len = batadv_max_header_len();
	int ret;		int ret;
	@@ -724,35 +696,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,

	kref_get(&hard_iface->refcount);		kref_get(&hard_iface->refcount);

	soft_iface = dev_get_by_name(net, iface_name);

	if (!soft_iface) {
	soft_iface = batadv_softif_create(net, iface_name);

	if (!soft_iface) {
	ret = -ENOMEM;
	goto err;
	}

	/* dev_get_by_name() increases the reference counter for us */
	dev_hold(soft_iface);		dev_hold(soft_iface);
	}

	if (!batadv_softif_is_valid(soft_iface)) {
	pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",
	soft_iface->name);
	ret = -EINVAL;
	goto err_dev;
	}

	/* check if the interface is enslaved in another virtual one and
	* in that case unlink it first
	*/
	master = netdev_master_upper_dev_get(hard_iface->net_dev);
	ret = batadv_master_del_slave(hard_iface, master);
	if (ret)
	goto err_dev;

	hard_iface->soft_iface = soft_iface;		hard_iface->soft_iface = soft_iface;
	bat_priv = netdev_priv(hard_iface->soft_iface);		bat_priv = netdev_priv(hard_iface->soft_iface);

	@@ -810,7 +754,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
	err_dev:		err_dev:
	hard_iface->soft_iface = NULL;		hard_iface->soft_iface = NULL;
	dev_put(soft_iface);		dev_put(soft_iface);
	err:
	batadv_hardif_put(hard_iface);		batadv_hardif_put(hard_iface);
	return ret;		return ret;
	}		}