mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 03:43:03 +00:00
b44cfec16d
commit 6c519bad7b19a2c14a075b400edabaa630330123 upstream. batman-adv saves its table of packet handlers as a global state, so handlers must be set up only once (and setting them up a second time will fail). The recently-added network coding support tries to set up its handler each time a new softif is registered, which obviously fails when more that one softif is used (and in consequence, the softif creation fails). Fix this by splitting up batadv_nc_init into batadv_nc_init (which is called only once) and batadv_nc_mesh_init (which is called for each softif); in addition batadv_nc_free is renamed to batadv_nc_mesh_free to keep naming consistent. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
130 lines
3.5 KiB
C
130 lines
3.5 KiB
C
/* Copyright (C) 2012-2013 B.A.T.M.A.N. contributors:
|
|
*
|
|
* Martin Hundebøll, Jeppe Ledet-Pedersen
|
|
*
|
|
* 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, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301, USA
|
|
*/
|
|
|
|
#ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_
|
|
#define _NET_BATMAN_ADV_NETWORK_CODING_H_
|
|
|
|
#ifdef CONFIG_BATMAN_ADV_NC
|
|
|
|
int batadv_nc_init(void);
|
|
int batadv_nc_mesh_init(struct batadv_priv *bat_priv);
|
|
void batadv_nc_mesh_free(struct batadv_priv *bat_priv);
|
|
void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
|
|
struct batadv_orig_node *orig_node,
|
|
struct batadv_orig_node *orig_neigh_node,
|
|
struct batadv_ogm_packet *ogm_packet,
|
|
int is_single_hop_neigh);
|
|
void batadv_nc_purge_orig(struct batadv_priv *bat_priv,
|
|
struct batadv_orig_node *orig_node,
|
|
bool (*to_purge)(struct batadv_priv *,
|
|
struct batadv_nc_node *));
|
|
void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv);
|
|
void batadv_nc_init_orig(struct batadv_orig_node *orig_node);
|
|
bool batadv_nc_skb_forward(struct sk_buff *skb,
|
|
struct batadv_neigh_node *neigh_node,
|
|
struct ethhdr *ethhdr);
|
|
void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,
|
|
struct sk_buff *skb);
|
|
void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
|
|
struct sk_buff *skb);
|
|
int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset);
|
|
int batadv_nc_init_debugfs(struct batadv_priv *bat_priv);
|
|
|
|
#else /* ifdef CONFIG_BATMAN_ADV_NC */
|
|
|
|
static inline int batadv_nc_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void
|
|
batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
|
|
struct batadv_orig_node *orig_node,
|
|
struct batadv_orig_node *orig_neigh_node,
|
|
struct batadv_ogm_packet *ogm_packet,
|
|
int is_single_hop_neigh)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void
|
|
batadv_nc_purge_orig(struct batadv_priv *bat_priv,
|
|
struct batadv_orig_node *orig_node,
|
|
bool (*to_purge)(struct batadv_priv *,
|
|
struct batadv_nc_node *))
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void batadv_nc_init_orig(struct batadv_orig_node *orig_node)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline bool batadv_nc_skb_forward(struct sk_buff *skb,
|
|
struct batadv_neigh_node *neigh_node,
|
|
struct ethhdr *ethhdr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline void
|
|
batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,
|
|
struct sk_buff *skb)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void
|
|
batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
|
|
struct sk_buff *skb)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline int batadv_nc_nodes_seq_print_text(struct seq_file *seq,
|
|
void *offset)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int batadv_nc_init_debugfs(struct batadv_priv *bat_priv)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif /* ifdef CONFIG_BATMAN_ADV_NC */
|
|
|
|
#endif /* _NET_BATMAN_ADV_NETWORK_CODING_H_ */
|