Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34dbba5d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-net-for-davem-20190201' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
Here are some batman-adv bugfixes:

 - Avoid WARN to report incorrect configuration, by Sven Eckelmann

 - Fix mac header position setting, by Sven Eckelmann

 - Fix releasing station statistics, by Felix Fietkau
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 84826ac7 7d652669

net/batman-adv/bat_v_elp.c

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 


		ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo);



		/* free the TID stats immediately */

		cfg80211_sinfo_release_content(&sinfo);



		dev_put(real_netdev);

		if (ret == -ENOENT) {

			/* Node is not associated anymore! It would be

net/batman-adv/hard-interface.c

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "main.h"



#include <linux/atomic.h>

#include <linux/bug.h>

#include <linux/byteorder/generic.h>

#include <linux/errno.h>

#include <linux/gfp.h>
@@ -179,8 +178,10 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) 
	parent_dev = __dev_get_by_index((struct net *)parent_net,

					dev_get_iflink(net_dev));

	/* if we got a NULL parent_dev there is something broken.. */

	if (WARN(!parent_dev, "Cannot find parent device"))

	if (!parent_dev) {

		pr_err("Cannot find parent device\n");

		return false;

	}



	if (batadv_mutual_parents(net_dev, net, parent_dev, parent_net))

		return false;

net/batman-adv/soft-interface.c

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, 


	netif_trans_update(soft_iface);

	vid = batadv_get_vid(skb, 0);



	skb_reset_mac_header(skb);

	ethhdr = eth_hdr(skb);



	switch (ntohs(ethhdr->h_proto)) {