Commit 8fec380a authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 4e2fa6b9 b2e55ca8

include/uapi/linux/batadv_packet.h

+1 −1
Original line number Diff line number Diff line 
/* 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

 */

include/uapi/linux/batman_adv.h

+1 −1
Original line number Diff line number Diff line 
/* 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

 */

net/batman-adv/Kconfig

+1 −2
Original line number Diff line number Diff line 
# 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
@@ -100,7 +100,6 @@ config BATMAN_ADV_DEBUG 
config BATMAN_ADV_SYSFS

	bool "batman-adv sysfs entries"

	depends on BATMAN_ADV

	default y

	help

	  Say Y here if you want to enable batman-adv device configuration and

	  status interface through sysfs attributes. It is replaced by the

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

net/batman-adv/bat_algo.c

+1 −1
Original line number Diff line number Diff line 
// 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

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE