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

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

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

 - de-inline hash functions to save memory footprint, by Denys Vlasenko

 - Add License information to various files, by Sven Eckelmann (3 patches)

 - Change batman_adv.h from ISC to MIT, by Sven Eckelmann

 - Improve various includes, by Sven Eckelmann (5 patches)

 - Lots of kernel-doc work by Sven Eckelmann (8 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b2597f78 ff15c27c

Documentation/networking/batman-adv.rst

+2 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



==========

batman-adv

==========

include/uapi/linux/batman_adv.h

+17 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright (C) 2016-2017  B.A.T.M.A.N. contributors:

 *

 * Matthias Schiffer

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */



#ifndef _UAPI_LINUX_BATMAN_ADV_H_

net/batman-adv/Kconfig

+17 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

# This program is free software; you can redistribute it and/or

# modify it under the terms of version 2 of the GNU General Public

# License as published by the Free Software Foundation.

#

# This program is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

# General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, see <http://www.gnu.org/licenses/>.



#

# B.A.T.M.A.N meshing protocol

#

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

net/batman-adv/bat_algo.c

+32 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich
@@ -37,7 +38,8 @@ char batadv_routing_algo[20] = "BATMAN_IV"; 
static struct hlist_head batadv_algo_list;



/**

 * batadv_algo_init - Initialize batman-adv algorithm management data structures

 * batadv_algo_init() - Initialize batman-adv algorithm management data

 *  structures

 */

void batadv_algo_init(void)

{
@@ -59,6 +61,12 @@ static struct batadv_algo_ops *batadv_algo_get(char *name) 
	return bat_algo_ops;

}



/**

 * batadv_algo_register() - Register callbacks for a mesh algorithm

 * @bat_algo_ops: mesh algorithm callbacks to add

 *

 * Return: 0 on success or negative error number in case of failure

 */

int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)

{

	struct batadv_algo_ops *bat_algo_ops_tmp;
@@ -88,6 +96,19 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) 
	return 0;

}



/**

 * batadv_algo_select() - Select algorithm of soft interface

 * @bat_priv: the bat priv with all the soft interface information

 * @name: name of the algorithm to select

 *

 * The algorithm callbacks for the soft interface will be set when the algorithm

 * with the correct name was found. Any previous selected algorithm will not be

 * deinitialized and the new selected algorithm will also not be initialized.

 * It is therefore not allowed to call batadv_algo_select outside the creation

 * function of the soft interface.

 *

 * Return: 0 on success or negative error number in case of failure

 */

int batadv_algo_select(struct batadv_priv *bat_priv, char *name)

{

	struct batadv_algo_ops *bat_algo_ops;
@@ -102,6 +123,14 @@ int batadv_algo_select(struct batadv_priv *bat_priv, char *name) 
}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS



/**

 * batadv_algo_seq_print_text() - Print the supported algorithms in a seq file

 * @seq: seq file to print on

 * @offset: not used

 *

 * Return: always 0

 */

int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)

{

	struct batadv_algo_ops *bat_algo_ops;
@@ -148,7 +177,7 @@ module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra, 
		0644);



/**

 * batadv_algo_dump_entry - fill in information about one supported routing

 * batadv_algo_dump_entry() - fill in information about one supported routing

 *  algorithm

 * @msg: netlink message to be sent back

 * @portid: Port to reply to
@@ -179,7 +208,7 @@ static int batadv_algo_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
}



/**

 * batadv_algo_dump - fill in information about supported routing

 * batadv_algo_dump() - fill in information about supported routing

 *  algorithms

 * @msg: netlink message to be sent back

 * @cb: Parameters to the netlink request