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

Merge tag 'batadv-next-for-davem-20180717' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

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

 - Don't call BATMAN_V experimental in Kconfig anymore, by Sven Eckelmann

 - Enable DAT by default at compile time, by Antonio Quartulli

 - Remove obsolete default n in Kconfig, by Sven Eckelmann

 - Fix checkpatch spelling errors, by Sven Eckelmann

 - Unify header guards style, by Sven Eckelmann

 - Consolidate batadv_purge_orig functions, by Sven Eckelmann

 - Replace type define with proper typedef, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fa52531e 993a4a5f

net/batman-adv/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ config BATMAN_ADV 
	depends on NET

	select CRC16

	select LIBCRC32C

        default n

	help

          B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is

          a routing protocol for multi-hop ad-hoc mesh networks. The
@@ -33,7 +32,7 @@ config BATMAN_ADV 
          tools.



config BATMAN_ADV_BATMAN_V

	bool "B.A.T.M.A.N. V protocol (experimental)"

	bool "B.A.T.M.A.N. V protocol"

	depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)

	default y

	help
@@ -60,7 +59,7 @@ config BATMAN_ADV_BLA 
config BATMAN_ADV_DAT

	bool "Distributed ARP Table"

	depends on BATMAN_ADV && INET

	default n

	default y

	help

	  This option enables DAT (Distributed ARP Table), a DHT based

	  mechanism that increases ARP reliability on sparse wireless
@@ -70,7 +69,6 @@ config BATMAN_ADV_DAT 
config BATMAN_ADV_NC

	bool "Network Coding"

	depends on BATMAN_ADV

	default n

	help

	  This option enables network coding, a mechanism that aims to

	  increase the overall network throughput by fusing multiple
@@ -84,7 +82,6 @@ config BATMAN_ADV_NC 
config BATMAN_ADV_MCAST

	bool "Multicast optimisation"

	depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y)

	default n

	help

	  This option enables the multicast optimisation which aims to

	  reduce the air overhead while improving the reliability of
@@ -94,7 +91,6 @@ config BATMAN_ADV_DEBUGFS 
	bool "batman-adv debugfs entries"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	default n

	help

	  Enable this to export routing related debug tables via debugfs.

	  The information for each soft-interface and used hard-interface can be

net/batman-adv/bat_iv_ogm.h

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_

#define _BATMAN_ADV_BATADV_IV_OGM_H_

#ifndef _NET_BATMAN_ADV_BAT_IV_OGM_H_

#define _NET_BATMAN_ADV_BAT_IV_OGM_H_



#include "main.h"



int batadv_iv_init(void);



#endif /* _BATMAN_ADV_BATADV_IV_OGM_H_ */
 
#endif /* _NET_BATMAN_ADV_BAT_IV_OGM_H_ */

net/batman-adv/bat_v_ogm.h

+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _BATMAN_ADV_BATADV_V_OGM_H_

#define _BATMAN_ADV_BATADV_V_OGM_H_

#ifndef _NET_BATMAN_ADV_BAT_V_OGM_H_

#define _NET_BATMAN_ADV_BAT_V_OGM_H_



#include "main.h"
@@ -34,4 +34,4 @@ void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface); 
int batadv_v_ogm_packet_recv(struct sk_buff *skb,

			     struct batadv_hard_iface *if_incoming);



#endif /* _BATMAN_ADV_BATADV_V_OGM_H_ */
 
#endif /* _NET_BATMAN_ADV_BAT_V_OGM_H_ */

net/batman-adv/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int batadv_bla_backbone_table_open(struct inode *inode, 


#ifdef CONFIG_BATMAN_ADV_DAT

/**

 * batadv_dat_cache_open() - Prepare file handler for reads from dat_chache

 * batadv_dat_cache_open() - Prepare file handler for reads from dat_cache

 * @inode: inode which was opened

 * @file: file handle to be initialized

 *

net/batman-adv/originator.c

+6 −11
Original line number Diff line number Diff line
@@ -1339,7 +1339,11 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, 
	return false;

}



static void _batadv_purge_orig(struct batadv_priv *bat_priv)

/**

 * batadv_purge_orig_ref() - Purge all outdated originators

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

 */

void batadv_purge_orig_ref(struct batadv_priv *bat_priv)

{

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	struct hlist_node *node_tmp;
@@ -1385,21 +1389,12 @@ static void batadv_purge_orig(struct work_struct *work) 


	delayed_work = to_delayed_work(work);

	bat_priv = container_of(delayed_work, struct batadv_priv, orig_work);

	_batadv_purge_orig(bat_priv);

	batadv_purge_orig_ref(bat_priv);

	queue_delayed_work(batadv_event_workqueue,

			   &bat_priv->orig_work,

			   msecs_to_jiffies(BATADV_ORIG_WORK_PERIOD));

}



/**

 * batadv_purge_orig_ref() - Purge all outdated originators

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

 */

void batadv_purge_orig_ref(struct batadv_priv *bat_priv)

{

	_batadv_purge_orig(bat_priv);

}



#ifdef CONFIG_BATMAN_ADV_DEBUGFS



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE