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

Commit 936f459b authored by David S. Miller's avatar David S. Miller
Browse files

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



Simon Wunderlich says:

====================
Here are two fixes for batman-adv for net-next:

 - fix double call of dev_queue_xmit(), caused by the recent introduction
   of net_xmit_eval(), by Sven Eckelmann

 - Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 678550c6 3e7514af

net/batman-adv/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "main.h"



#include <linux/debugfs.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/fs.h>

net/batman-adv/send.c

+3 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ int batadv_send_skb_packet(struct sk_buff *skb, 
{

	struct batadv_priv *bat_priv;

	struct ethhdr *ethhdr;

	int ret;



	bat_priv = netdev_priv(hard_iface->soft_iface);
@@ -115,7 +116,8 @@ int batadv_send_skb_packet(struct sk_buff *skb, 
	 * congestion and traffic shaping, it drops and returns NET_XMIT_DROP

	 * (which is > 0). This will not be treated as an error.

	 */

	return net_xmit_eval(dev_queue_xmit(skb));

	ret = dev_queue_xmit(skb);

	return net_xmit_eval(ret);

send_skb_err:

	kfree_skb(skb);

	return NET_XMIT_DROP;

net/batman-adv/tp_meter.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/byteorder/generic.h>

#include <linux/cache.h>

#include <linux/compiler.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/etherdevice.h>

#include <linux/fs.h>

#include <linux/if_ether.h>