Commit 9d2c27aa authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-next-pullrequest-20220103' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich
 - allow netlink usage in unprivileged containers, by Linus Lüssing
 - remove unneeded variable, by Minghao Chi

* tag 'batadv-next-pullrequest-20220103' of git://git.open-mesh.org/linux-merge:
  batman-adv: remove unneeded variable in batadv_nc_init
  batman-adv: allow netlink usage in unprivileged containers
  batman-adv: Start new development cycle
====================

Link: https://lore.kernel.org/r/20220103171722.1126109-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7590fc6f cde3fac5

net/batman-adv/main.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define BATADV_DRIVER_DEVICE "batman-adv"



#ifndef BATADV_SOURCE_VERSION

#define BATADV_SOURCE_VERSION "2021.3"

#define BATADV_SOURCE_VERSION "2022.0"

#endif



/* B.A.T.M.A.N. parameters */

net/batman-adv/netlink.c

+15 −15
Original line number Diff line number Diff line
@@ -1368,21 +1368,21 @@ static const struct genl_small_ops batadv_netlink_ops[] = { 
	{

		.cmd = BATADV_CMD_TP_METER,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.doit = batadv_netlink_tp_meter_start,

		.internal_flags = BATADV_FLAG_NEED_MESH,

	},

	{

		.cmd = BATADV_CMD_TP_METER_CANCEL,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.doit = batadv_netlink_tp_meter_cancel,

		.internal_flags = BATADV_FLAG_NEED_MESH,

	},

	{

		.cmd = BATADV_CMD_GET_ROUTING_ALGOS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_algo_dump,

	},

	{
@@ -1397,68 +1397,68 @@ static const struct genl_small_ops batadv_netlink_ops[] = { 
	{

		.cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_tt_local_dump,

	},

	{

		.cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_tt_global_dump,

	},

	{

		.cmd = BATADV_CMD_GET_ORIGINATORS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_orig_dump,

	},

	{

		.cmd = BATADV_CMD_GET_NEIGHBORS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_hardif_neigh_dump,

	},

	{

		.cmd = BATADV_CMD_GET_GATEWAYS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_gw_dump,

	},

	{

		.cmd = BATADV_CMD_GET_BLA_CLAIM,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_bla_claim_dump,

	},

	{

		.cmd = BATADV_CMD_GET_BLA_BACKBONE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_bla_backbone_dump,

	},

	{

		.cmd = BATADV_CMD_GET_DAT_CACHE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_dat_cache_dump,

	},

	{

		.cmd = BATADV_CMD_GET_MCAST_FLAGS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.dumpit = batadv_mcast_flags_dump,

	},

	{

		.cmd = BATADV_CMD_SET_MESH,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.doit = batadv_netlink_set_mesh,

		.internal_flags = BATADV_FLAG_NEED_MESH,

	},

	{

		.cmd = BATADV_CMD_SET_HARDIF,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.doit = batadv_netlink_set_hardif,

		.internal_flags = BATADV_FLAG_NEED_MESH |

				  BATADV_FLAG_NEED_HARDIF,
@@ -1474,7 +1474,7 @@ static const struct genl_small_ops batadv_netlink_ops[] = { 
	{

		.cmd = BATADV_CMD_SET_VLAN,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

		.doit = batadv_netlink_set_vlan,

		.internal_flags = BATADV_FLAG_NEED_MESH |

				  BATADV_FLAG_NEED_VLAN,

net/batman-adv/network-coding.c

+2 −6
Original line number Diff line number Diff line
@@ -58,13 +58,9 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb, 
 */

int __init batadv_nc_init(void)

{

	int ret;



	/* Register our packet type */

	ret = batadv_recv_handler_register(BATADV_CODED,

	return batadv_recv_handler_register(BATADV_CODED,

					    batadv_nc_recv_coded_packet);



	return ret;

}



/**