hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This feature/cleanup patchset includes the following patches: 

- bump version strings, by Simon Wunderlich
 
  - fix typo and kerneldocs, by Sven Eckelmann
 
  - use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by René Treffer
 
  - silence some endian sparse warnings by adding annotations,
    by Sven Eckelmann
 
  - Update copyright years to 2020, by Sven Eckelmann
 
  - Disable deprecated sysfs configuration by default, by Sven Eckelmann
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl4dzoQWHHN3QHNpbW9u
 d3VuZGVybGljaC5kZQAKCRChK+OYQpKeodEbD/0fM2O/hx/CsBoWDt9rU+tA/Nh8
 CWYUn9fjghG3RpSCzIjqpcwSe4T09KHw7BvPBiWpVNmUYeNz7aLmujbaj1DmAY8l
 l50VHtJYM1aCIC8O3UcqznrUtoyEdAi78gpxUXLVNABJ9t9gkpXaS3bM06gs5QW4
 7Y5KSpN9O7a7QrLByb8KZUuZrHCSUzrVJHkc3eZ4FqAk3jRw0LjaMIkoQaKImc9D
 wOUTU0rUvuTNBZ9jteChWkfpHwa1QrRgoxYiw5d5u7FT7yOZE1NoQUbm0ZzhdMrO
 QLkcdN8n6gI8waDP47cxwNmSRpRS8S7PIyG2MSi1LNoENUcdHuPuPFAnBbXWyUqc
 QAXSe+JS2MKAT13Tt8+y34WWCtT94K7Hko1SbT4WpawdF1G+DzT2BNI9p+kOJLRV
 Ap7OHTwrZHqkTyQLbMEYdfIPFwMilYEc+O24kjOw6OCSt45F1l9bad4IwvE/iASb
 HNzLO2Jlj5gUMXShbcIzC3PGYSMWpZKoX3075SqOXjcOKfF/jUYfaUt8WSUvi1bA
 CcEMD7FMrVa0mBkhG2WUO9f/ARlfTckhg/ijD4NSDLy7CsjhWXZL7lC9N7R43ktM
 LThTJ+ey1P+K6q1OH4ytvlApSwHC1OdaA6zUhoht9XQDHrnLf6gDpTDd4xn8zKPZ
 BXbGv9bCi3/df6ocCw==
 =xeMk
 -----END PGP SIGNATURE-----

Merge tag 'batadv-next-for-davem-20200114' 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

 - fix typo and kerneldocs, by Sven Eckelmann

 - use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by René Treffer

 - silence some endian sparse warnings by adding annotations,
   by Sven Eckelmann

 - Update copyright years to 2020, by Sven Eckelmann

 - Disable deprecated sysfs configuration by default, by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-01-15 23:04:04 +01:00
parent 4e2fa6b902 b2e55ca892
commit 8fec380ac0
63 changed files with 87 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/batadv_packet.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
include/uapi/linux/batman_adv.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
* *
* Matthias Schiffer * Matthias Schiffer
*/ */

3
net/batman-adv/Kconfig
View File

@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: # Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
# #
# Marek Lindner, Simon Wunderlich # Marek Lindner, Simon Wunderlich
@ -100,7 +100,6 @@ config BATMAN_ADV_DEBUG
config BATMAN_ADV_SYSFS config BATMAN_ADV_SYSFS
bool "batman-adv sysfs entries" bool "batman-adv sysfs entries"
depends on BATMAN_ADV depends on BATMAN_ADV
default y
help help
Say Y here if you want to enable batman-adv device configuration and Say Y here if you want to enable batman-adv device configuration and
status interface through sysfs attributes. It is replaced by the status interface through sysfs attributes. It is replaced by the

2
net/batman-adv/Makefile
View File

@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: # Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
# #
# Marek Lindner, Simon Wunderlich # Marek Lindner, Simon Wunderlich

2
net/batman-adv/bat_algo.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/bat_algo.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Linus Lüssing * Marek Lindner, Linus Lüssing
*/ */

2
net/batman-adv/bat_iv_ogm.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/bat_iv_ogm.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/bat_v.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Linus Lüssing, Marek Lindner * Linus Lüssing, Marek Lindner
*/ */

2
net/batman-adv/bat_v.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Linus Lüssing * Marek Lindner, Linus Lüssing
*/ */

13
net/batman-adv/bat_v_elp.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Linus Lüssing, Marek Lindner * Linus Lüssing, Marek Lindner
*/ */
@ -107,10 +107,17 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
} }
if (ret) if (ret)
goto default_throughput; goto default_throughput;
if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)))
goto default_throughput;
if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))
return sinfo.expected_throughput / 100; return sinfo.expected_throughput / 100;
/* try to estimate the expected throughput based on reported tx
* rates
*/
if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE))
return cfg80211_calculate_bitrate(&sinfo.txrate) / 3;
goto default_throughput;
} }
/* if not a wifi interface, check if this device provides data via /* if not a wifi interface, check if this device provides data via

2
net/batman-adv/bat_v_elp.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Linus Lüssing, Marek Lindner * Linus Lüssing, Marek Lindner
*/ */

2
net/batman-adv/bat_v_ogm.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Antonio Quartulli * Antonio Quartulli
*/ */

2
net/batman-adv/bat_v_ogm.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Antonio Quartulli * Antonio Quartulli
*/ */

2
net/batman-adv/bitarray.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich, Marek Lindner * Simon Wunderlich, Marek Lindner
*/ */

2
net/batman-adv/bitarray.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich, Marek Lindner * Simon Wunderlich, Marek Lindner
*/ */

4
net/batman-adv/bridge_loop_avoidance.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich * Simon Wunderlich
*/ */
@ -844,7 +844,7 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,
/* handle as ANNOUNCE frame */ /* handle as ANNOUNCE frame */
backbone_gw->lasttime = jiffies; backbone_gw->lasttime = jiffies;
crc = ntohs(*((__be16 *)(&an_addr[4]))); crc = ntohs(*((__force __be16 *)(&an_addr[4])));
batadv_dbg(BATADV_DBG_BLA, bat_priv, batadv_dbg(BATADV_DBG_BLA, bat_priv,
"%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",

2
net/batman-adv/bridge_loop_avoidance.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich * Simon Wunderlich
*/ */

2
net/batman-adv/debugfs.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/debugfs.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

10
net/batman-adv/distributed-arp-table.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Antonio Quartulli * Antonio Quartulli
*/ */
@ -246,7 +246,7 @@ static u8 *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size)
*/ */
static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size)
{ {
return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN); return *(__force __be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN);
} }
/** /**
@ -270,7 +270,9 @@ static u8 *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size)
*/ */
static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size)
{ {
return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4); u8 *dst = batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4;
return *(__force __be32 *)dst;
} }
/** /**
@ -287,7 +289,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)
const unsigned char *key; const unsigned char *key;
u32 i; u32 i;
key = (const unsigned char *)&dat->ip; key = (__force const unsigned char *)&dat->ip;
for (i = 0; i < sizeof(dat->ip); i++) { for (i = 0; i < sizeof(dat->ip); i++) {
hash += key[i]; hash += key[i];
hash += (hash << 10); hash += (hash << 10);

2
net/batman-adv/distributed-arp-table.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors:
* *
* Antonio Quartulli * Antonio Quartulli
*/ */

2
net/batman-adv/fragmentation.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Martin Hundebøll <martin@hundeboll.net> * Martin Hundebøll <martin@hundeboll.net>
*/ */

2
net/batman-adv/fragmentation.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
* *
* Martin Hundebøll <martin@hundeboll.net> * Martin Hundebøll <martin@hundeboll.net>
*/ */

2
net/batman-adv/gateway_client.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/gateway_client.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/gateway_common.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/gateway_common.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/hard-interface.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/hard-interface.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/hash.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich, Marek Lindner * Simon Wunderlich, Marek Lindner
*/ */

2
net/batman-adv/hash.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
* *
* Simon Wunderlich, Marek Lindner * Simon Wunderlich, Marek Lindner
*/ */

2
net/batman-adv/icmp_socket.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/icmp_socket.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/log.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

12
net/batman-adv/log.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */
@ -74,7 +74,7 @@ __printf(2, 3);
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @ratelimited: whether output should be rate limited * @ratelimited: whether output should be rate limited
* @fmt: format string * @fmt: format string
* @arg...: variable arguments * @arg: variable arguments
*/ */
#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ #define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \
do { \ do { \
@ -98,7 +98,7 @@ static inline void _batadv_dbg(int type __always_unused,
* batadv_dbg() - Store debug output without ratelimiting * batadv_dbg() - Store debug output without ratelimiting
* @type: type of debug message * @type: type of debug message
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @arg...: format string and variable arguments * @arg: format string and variable arguments
*/ */
#define batadv_dbg(type, bat_priv, arg...) \ #define batadv_dbg(type, bat_priv, arg...) \
_batadv_dbg(type, bat_priv, 0, ## arg) _batadv_dbg(type, bat_priv, 0, ## arg)
@ -107,7 +107,7 @@ static inline void _batadv_dbg(int type __always_unused,
* batadv_dbg_ratelimited() - Store debug output with ratelimiting * batadv_dbg_ratelimited() - Store debug output with ratelimiting
* @type: type of debug message * @type: type of debug message
* @bat_priv: the bat priv with all the soft interface information * @bat_priv: the bat priv with all the soft interface information
* @arg...: format string and variable arguments * @arg: format string and variable arguments
*/ */
#define batadv_dbg_ratelimited(type, bat_priv, arg...) \ #define batadv_dbg_ratelimited(type, bat_priv, arg...) \
_batadv_dbg(type, bat_priv, 1, ## arg) _batadv_dbg(type, bat_priv, 1, ## arg)
@ -116,7 +116,7 @@ static inline void _batadv_dbg(int type __always_unused,
* batadv_info() - Store message in debug buffer and print it to kmsg buffer * batadv_info() - Store message in debug buffer and print it to kmsg buffer
* @net_dev: the soft interface net device * @net_dev: the soft interface net device
* @fmt: format string * @fmt: format string
* @arg...: variable arguments * @arg: variable arguments
*/ */
#define batadv_info(net_dev, fmt, arg...) \ #define batadv_info(net_dev, fmt, arg...) \
do { \ do { \
@ -130,7 +130,7 @@ static inline void _batadv_dbg(int type __always_unused,
* batadv_err() - Store error in debug buffer and print it to kmsg buffer * batadv_err() - Store error in debug buffer and print it to kmsg buffer
* @net_dev: the soft interface net device * @net_dev: the soft interface net device
* @fmt: format string * @fmt: format string
* @arg...: variable arguments * @arg: variable arguments
*/ */
#define batadv_err(net_dev, fmt, arg...) \ #define batadv_err(net_dev, fmt, arg...) \
do { \ do { \

2
net/batman-adv/main.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

4
net/batman-adv/main.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */
@ -13,7 +13,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv" #define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION #ifndef BATADV_SOURCE_VERSION
#define BATADV_SOURCE_VERSION "2019.5" #define BATADV_SOURCE_VERSION "2020.0"
#endif #endif
/* B.A.T.M.A.N. parameters */ /* B.A.T.M.A.N. parameters */

2
net/batman-adv/multicast.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2014-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2014-2020 B.A.T.M.A.N. contributors:
* *
* Linus Lüssing * Linus Lüssing
*/ */

2
net/batman-adv/multicast.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2014-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2014-2020 B.A.T.M.A.N. contributors:
* *
* Linus Lüssing * Linus Lüssing
*/ */

2
net/batman-adv/netlink.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
* *
* Matthias Schiffer * Matthias Schiffer
*/ */

2
net/batman-adv/netlink.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
* *
* Matthias Schiffer * Matthias Schiffer
*/ */

2
net/batman-adv/network-coding.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
* *
* Martin Hundebøll, Jeppe Ledet-Pedersen * Martin Hundebøll, Jeppe Ledet-Pedersen
*/ */

2
net/batman-adv/network-coding.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
* *
* Martin Hundebøll, Jeppe Ledet-Pedersen * Martin Hundebøll, Jeppe Ledet-Pedersen
*/ */

2
net/batman-adv/originator.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/originator.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/routing.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/routing.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/send.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/send.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/soft-interface.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/soft-interface.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/sysfs.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/sysfs.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner * Marek Lindner
*/ */

2
net/batman-adv/tp_meter.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
* *
* Edo Monticelli, Antonio Quartulli * Edo Monticelli, Antonio Quartulli
*/ */

2
net/batman-adv/tp_meter.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
* *
* Edo Monticelli, Antonio Quartulli * Edo Monticelli, Antonio Quartulli
*/ */

2
net/batman-adv/trace.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Sven Eckelmann * Sven Eckelmann
*/ */

2
net/batman-adv/trace.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2010-2020 B.A.T.M.A.N. contributors:
* *
* Sven Eckelmann * Sven Eckelmann
*/ */

2
net/batman-adv/translation-table.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich, Antonio Quartulli * Marek Lindner, Simon Wunderlich, Antonio Quartulli
*/ */

2
net/batman-adv/translation-table.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich, Antonio Quartulli * Marek Lindner, Simon Wunderlich, Antonio Quartulli
*/ */

2
net/batman-adv/tvlv.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

2
net/batman-adv/tvlv.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */

6
net/batman-adv/types.h
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: /* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
* *
* Marek Lindner, Simon Wunderlich * Marek Lindner, Simon Wunderlich
*/ */
@ -457,7 +457,7 @@ struct batadv_orig_node {
/** /**
* @tt_lock: prevents from updating the table while reading it. Table * @tt_lock: prevents from updating the table while reading it. Table
* update is made up by two operations (data structure update and * update is made up by two operations (data structure update and
* metdata -CRC/TTVN-recalculation) and they have to be executed * metadata -CRC/TTVN-recalculation) and they have to be executed
* atomically in order to avoid another thread to read the * atomically in order to avoid another thread to read the
* table/metadata between those. * table/metadata between those.
*/ */
@ -1011,7 +1011,7 @@ struct batadv_priv_tt {
/** /**
* @commit_lock: prevents from executing a local TT commit while reading * @commit_lock: prevents from executing a local TT commit while reading
* the local table. The local TT commit is made up by two operations * the local table. The local TT commit is made up by two operations
* (data structure update and metdata -CRC/TTVN- recalculation) and * (data structure update and metadata -CRC/TTVN- recalculation) and
* they have to be executed atomically in order to avoid another thread * they have to be executed atomically in order to avoid another thread
* to read the table/metadata between those. * to read the table/metadata between those.
*/ */