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

On branch : master

commit 4c4512f73a7628781d86cda244943d7b8224b206 Merge: 2c236a3 768323e Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jun 9 22:56:50 2015 +0800

Merge branch 'next'

Conflicts: net/batman-adv/distributed-arp-table.c net/batman-adv/gateway_client.c

4c4512f73a7628781d86cda244943d7b8224b206 net/batman-adv/distributed-arp-table.c | 18 +++++++++++++----- net/batman-adv/gateway_client.c | 3 ++- 2 files changed, 15 insertions(+), 6 deletions(-)

diff --cc net/batman-adv/distributed-arp-table.c index 1ec237a,6d0b471..ce7bfa1 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -1141,10 -1145,10 +1144,10 @@@ void batadv_dat_snoop_outgoing_arp_repl bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) { - uint16_t type; + u16 type; __be32 ip_src, ip_dst; - uint8_t *hw_src, *hw_dst; + u8 *hw_src, *hw_dst; - bool ret = false; + bool dropped = false; unsigned short vid;

if (!atomic_read(&bat_priv->distributed_arp_table)) diff --cc net/batman-adv/gateway_client.c index a404fa7,1f50661..2edebbd --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -153,10 -153,10 +153,11 @@@ batadv_gw_get_best_gw_node(struct batad struct batadv_neigh_node *router; struct batadv_neigh_ifinfo *router_ifinfo; struct batadv_gw_node *gw_node, *curr_gw = NULL; - u32 max_gw_factor = 0, tmp_gw_factor = 0; - uint64_t max_gw_factor = 0, tmp_gw_factor = 0; - uint32_t gw_divisor; - uint8_t max_tq = 0; - uint8_t tq_avg; ++ u64 max_gw_factor = 0; ++ u64 tmp_gw_factor = 0; + u32 gw_divisor; + u8 max_tq = 0; + u8 tq_avg; struct batadv_orig_node *orig_node;

gw_divisor = BATADV_TQ_LOCAL_WINDOW_SIZE * BATADV_TQ_LOCAL_WINDOW_SIZE;