Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit e3e3464bb5a0aac5a3f4f156eff84b6a2e6a3591 Merge: 7378830 12c771d Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Jul 6 21:22:05 2016 +0800

Merge branch 'maint' into next

e3e3464bb5a0aac5a3f4f156eff84b6a2e6a3591 net/batman-adv/send.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc net/batman-adv/send.c index 3a10d87,0103976..6191159 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@@ -435,11 -424,31 +435,11 @@@ int batadv_send_skb_via_gw(struct batad struct batadv_orig_node *orig_node;

orig_node = batadv_gw_get_selected_orig(bat_priv); - return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0, - orig_node, vid); + return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR, + BATADV_P_DATA, orig_node, vid); }

-void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface) -{ - struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - - if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) || - (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)) - return; - - /* the interface gets activated here to avoid race conditions between - * the moment of activating the interface in - * hardif_activate_interface() where the originator mac is set and - * outdated packets (especially uninitialized mac addresses) in the - * packet queue - */ - if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED) - hard_iface->if_status = BATADV_IF_ACTIVE; - - bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface); -} - -static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) { kfree_skb(forw_packet->skb); if (forw_packet->if_incoming)