mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich - ignore self-generated loop detect MAC addresses in translation table, by Simon Wunderlich - install uapi batman_adv.h header, by Sven Eckelmann - bump copyright years, by Sven Eckelmann - Remove an unused variable in translation table code, by Sven Eckelmann - Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids suggestion), and a follow up code clean up, by Gao Feng (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAliKJcgWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoYzFEACGNOZcW2bFFpuE5CZWZpTW1n24 YAY/3C+THc89oUyn7ZbWpZ05HcG+JZXOWCWHaRTnd4UeA+sbki53Ioo52ZGgo79C 7LsyXMMH3F2NrXVEfCK/MUGZcqBAxMd4dcDPsYz5q5osxydjG3hEJLikqOluop3P JKK9FTEeP2JeoWz9eEf7Io2te6EwcIjo3TRa9f53uyyhPnk5eS2NeSle5axZqS7c l+NSZVlrrG7oUB0UdzABt5NWOvjDc+Lqp1dkoJo17PHOgXialIfjZOKUlKtjVx6E 06ow2HZaEYCtdlb0awjyPxtIpwiy0szTzJa/h4XtzeQHgbOKIqJWAEb80X7imHVE aljP7A1uuGm0bcVQ+pq21PX8yLu4RCDPDE5Khu9atkiQP5+sVEdGiJ8Soaw4PmoD yhDmXshrPGR8u5txN8gaHWG4MHt19645s8dHqHQ7tf5h+mf2QXQ2v/jJQsCV2UfY vLd/JOD4ZVYWDCspcDdEwGc8KB9r6P31wXuSVjYfkqTFXocdzDr87V7C69CS0U+b Lzel8oa/eVa2ppR+OhpELxhL2ahO7p1jZI2ix4NHftx5MAV4WJ3RfR2ev2Sf9Ukc aGjzjuml3JVo2i+11lqiAtOaBK9wDNv1CaC+D2NmC6wpWzWQryNryw3fm2SoH3Xm S+UoBDZpik+SIEBv3Q== =cd1Y -----END PGP SIGNATURE----- Merge tag 'batadv-next-for-davem-20170126' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - ignore self-generated loop detect MAC addresses in translation table, by Simon Wunderlich - install uapi batman_adv.h header, by Sven Eckelmann - bump copyright years, by Sven Eckelmann - Remove an unused variable in translation table code, by Sven Eckelmann - Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids suggestion), and a follow up code clean up, by Gao Feng (2 patches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
49b3eb7725
@ -64,6 +64,7 @@ header-y += auto_fs.h
|
||||
header-y += auxvec.h
|
||||
header-y += ax25.h
|
||||
header-y += b1lli.h
|
||||
header-y += batman_adv.h
|
||||
header-y += baycom.h
|
||||
header-y += bcm933xx_hcs.h
|
||||
header-y += bfs_fs.h
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Matthias Schiffer
|
||||
*
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
#
|
||||
# Marek Lindner, Simon Wunderlich
|
||||
#
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Linus Lüssing
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Linus Lüssing, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Linus Lüssing
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Linus Lüssing, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Linus Lüssing, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich
|
||||
*
|
||||
@ -20,6 +20,8 @@
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct net_device;
|
||||
@ -27,6 +29,22 @@ struct netlink_callback;
|
||||
struct seq_file;
|
||||
struct sk_buff;
|
||||
|
||||
/**
|
||||
* batadv_bla_is_loopdetect_mac - check if the mac address is from a loop detect
|
||||
* frame sent by bridge loop avoidance
|
||||
* @mac: mac address to check
|
||||
*
|
||||
* Return: true if the it looks like a loop detect frame
|
||||
* (mac starts with BA:BE), false otherwise
|
||||
*/
|
||||
static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac)
|
||||
{
|
||||
if (mac[0] == 0xba && mac[1] == 0xbe)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BATMAN_ADV_BLA
|
||||
bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
||||
unsigned short vid, bool is_bcast);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Martin Hundebøll <martin@hundeboll.net>
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Martin Hundebøll <martin@hundeboll.net>
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Simon Wunderlich, Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
@ -24,7 +24,7 @@
|
||||
#define BATADV_DRIVER_DEVICE "batman-adv"
|
||||
|
||||
#ifndef BATADV_SOURCE_VERSION
|
||||
#define BATADV_SOURCE_VERSION "2016.5"
|
||||
#define BATADV_SOURCE_VERSION "2017.0"
|
||||
#endif
|
||||
|
||||
/* B.A.T.M.A.N. parameters */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Linus Lüssing
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Linus Lüssing
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Matthias Schiffer
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Matthias Schiffer
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Martin Hundebøll, Jeppe Ledet-Pedersen
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Martin Hundebøll, Jeppe Ledet-Pedersen
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
@ -719,20 +719,19 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
|
||||
|
||||
len = skb->len;
|
||||
res = batadv_send_skb_to_orig(skb, orig_node, recv_if);
|
||||
if (res == NET_XMIT_SUCCESS)
|
||||
ret = NET_RX_SUCCESS;
|
||||
|
||||
/* skb was consumed */
|
||||
skb = NULL;
|
||||
|
||||
/* translate transmit result into receive result */
|
||||
if (res == NET_XMIT_SUCCESS) {
|
||||
ret = NET_RX_SUCCESS;
|
||||
/* skb was transmitted and consumed */
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
|
||||
batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
|
||||
len + ETH_HLEN);
|
||||
}
|
||||
|
||||
/* skb was consumed */
|
||||
skb = NULL;
|
||||
|
||||
put_orig_node:
|
||||
batadv_orig_node_put(orig_node);
|
||||
free_skb:
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
@ -115,7 +115,7 @@ 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 dev_queue_xmit(skb);
|
||||
return net_xmit_eval(dev_queue_xmit(skb));
|
||||
send_skb_err:
|
||||
kfree_skb(skb);
|
||||
return NET_XMIT_DROP;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
@ -258,7 +258,8 @@ static int batadv_interface_tx(struct sk_buff *skb,
|
||||
ethhdr = eth_hdr(skb);
|
||||
|
||||
/* Register the client MAC in the transtable */
|
||||
if (!is_multicast_ether_addr(ethhdr->h_source)) {
|
||||
if (!is_multicast_ether_addr(ethhdr->h_source) &&
|
||||
!batadv_bla_is_loopdetect_mac(ethhdr->h_source)) {
|
||||
client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source,
|
||||
vid, skb->skb_iif,
|
||||
skb->mark);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Edo Monticelli, Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Edo Monticelli, Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich, Antonio Quartulli
|
||||
*
|
||||
@ -3714,7 +3714,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
|
||||
{
|
||||
struct batadv_hashtable *hash = bat_priv->tt.local_hash;
|
||||
struct batadv_tt_common_entry *tt_common_entry;
|
||||
u16 changed_num = 0;
|
||||
struct hlist_head *head;
|
||||
u32 i;
|
||||
|
||||
@ -3736,7 +3735,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
|
||||
continue;
|
||||
tt_common_entry->flags &= ~flags;
|
||||
}
|
||||
changed_num++;
|
||||
|
||||
if (!count)
|
||||
continue;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich, Antonio Quartulli
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors:
|
||||
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
|
||||
*
|
||||
* Marek Lindner, Simon Wunderlich
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user