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 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAltOCjwWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeofMDEADT/6zV4ZTLlIhkTGBKbWlDm3Op m+suGldpOHeh6Bzu/9N4F9NqczNq6YH9L702Htp6VcnmPxzSYuXV65jcOUiWyeoe WIdktfHi93oylZlcT3ykWRiipzzoYKJ6Tna2K/MLncZ6O/v6dmmBaE2r2JbSUju7 U7+mWkfBP2UYqMEUcGcDgtCBtXEwUi70jJkjx7eQ3SWpFqhxRs4ueGKC8o+aPGKY +yhHOkyyf9ByqtUPHIMWkNvjMntiofqAOekAjF+ISLHTr0oqRsSGcQanLXWUzyFB 3HPDUkTRQK1fKfSAwRHhSwkSH1Tf1paSsBSFc3aIkFRndKHV3t/72HW/Md1WLvKw hXgZq5iwek2bMmdMXbbIu7ghj/Rv0xA4rtAEqVldmlGc+DqZTozwNSs0O9w+MUpr nqofTF1SM2QQmDW/kjqtH9Abi89gnpg4vGG6UNq1Dh0EFgI8mmy1vADP5Wsd96z4 mbpkn4EmUUeQKSa2PmCjCHsyOLr4QDp/+YBoeufjCXU2FECE575JvqP0/I7OJkbD /YvQziDEdvdqJRsZBX2KbjRwH2eY5tDZLodUuWMUr8qphUPIfV1entIv+WG03vTf 10HoAoYDu9j+d37vA07oAj8Z7SndIC2VllT7mYqg93s7iHTyHRly5601bdC2b/51 DIYsSG2sCnPVf7myfA== =dmZo -----END PGP SIGNATURE----- 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
c0b78038a8
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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_ */
|
||||
|
|
|
|||
|
|
@ -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_ */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -43,12 +43,13 @@ struct seq_file;
|
|||
#ifdef CONFIG_BATMAN_ADV_DAT
|
||||
|
||||
/**
|
||||
* batadv_dat_addr_t - it is the type used for all DHT addresses. If it is
|
||||
* changed, BATADV_DAT_ADDR_MAX is changed as well.
|
||||
* typedef batadv_dat_addr_t - type used for all DHT addresses
|
||||
*
|
||||
* If it is changed, BATADV_DAT_ADDR_MAX is changed as well.
|
||||
*
|
||||
* *Please be careful: batadv_dat_addr_t must be UNSIGNED*
|
||||
*/
|
||||
#define batadv_dat_addr_t u16
|
||||
typedef u16 batadv_dat_addr_t;
|
||||
|
||||
#endif /* CONFIG_BATMAN_ADV_DAT */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue