diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-29 19:21:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-29 19:21:26 -0500 |
| commit | 936f459bea07868723b057ece43d321446c82f0a (patch) | |
| tree | 45b3174a471b105139d56fc7f6814f3b50bb4901 /net/batman-adv | |
| parent | 678550c651aee051d66112933c87894f129b9355 (diff) | |
| parent | 3e7514afc7d728dd47c5fe9d7a1f5216fe659cda (diff) | |
| download | linux-936f459bea07868723b057ece43d321446c82f0a.tar.gz linux-936f459bea07868723b057ece43d321446c82f0a.tar.bz2 linux-936f459bea07868723b057ece43d321446c82f0a.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/debugfs.c | 2 | ||||
| -rw-r--r-- | net/batman-adv/send.c | 4 | ||||
| -rw-r--r-- | net/batman-adv/tp_meter.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 5406148b9497..e32ad47c6efd 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -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> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index d9b2889064a6..1489ec27daff 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -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; diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 07f64b60b528..c94ebdecdc3d 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -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> |