The following commit has been merged in the merge/master branch: commit 198948a4d49351fad3caff57ca01ab9266782b27 Merge: a6d3936843b7050528117ab14a3de7a67de48bfa 746e5dd81e4981d535d7100b414a78040522308f Author: Antonio Quartulli ordex@autistici.org Date: Fri May 11 09:42:59 2012 +0200
Merge remote-tracking branch 'origin/standalone/next' into merge/master
diff --combined net/batman-adv/bat_iv_ogm.c index 2a1845e,92fad91..92fad91 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -38,7 -38,7 +38,7 @@@ static struct neigh_node *bat_iv_ogm_ne { struct neigh_node *neigh_node;
- neigh_node = neigh_node_new(hard_iface, neigh_addr, seqno); + neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno); if (!neigh_node) goto out;
@@@ -518,13 -518,12 +518,12 @@@ static void bat_iv_ogm_forward(struct o }
if (!is_from_best_next_hop) { - /** - * Mark the forwarded packet when it is not coming from our best - * next hop. We still need to forward the packet for our neighbor - * link quality detection to work in case the packet originated - * from a single hop neighbor. Otherwise we can simply drop the - * ogm. - */ + /* Mark the forwarded packet when it is not coming from our + * best next hop. We still need to forward the packet for our + * neighbor link quality detection to work in case the packet + * originated from a single hop neighbor. Otherwise we can + * simply drop the ogm. + */ if (is_single_hop_neigh) batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP; else @@@ -1200,7 -1199,8 +1199,8 @@@ static int bat_iv_ogm_receive(struct sk return NET_RX_DROP;
/* did we receive a B.A.T.M.A.N. IV OGM packet on an interface - * that does not have B.A.T.M.A.N. IV enabled ? */ + * that does not have B.A.T.M.A.N. IV enabled ? + */ if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) return NET_RX_DROP;
diff --combined net/batman-adv/originator.c index 30889c9,c6a00b3..c6a00b3 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -86,8 -86,9 +86,9 @@@ struct neigh_node *orig_node_get_router return router; }
- struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno) + struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct neigh_node *neigh_node; diff --combined net/batman-adv/originator.h index 64c5d94,f74d0d6..f74d0d6 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@@ -29,8 -29,9 +29,9 @@@ void originator_free(struct bat_priv *b void purge_orig_ref(struct bat_priv *bat_priv); void orig_node_free_ref(struct orig_node *orig_node); struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr); - struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno); + struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno); void neigh_node_free_ref(struct neigh_node *neigh_node); struct neigh_node *orig_node_get_router(struct orig_node *orig_node); int orig_seq_print_text(struct seq_file *seq, void *offset); diff --combined net/batman-adv/types.h index 15f538a,6474324..6474324 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -399,7 -399,8 +399,8 @@@ struct bat_algo_ops /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* (re-)init mac addresses of the protocol information - * belonging to this hard-interface */ + * belonging to this hard-interface + */ void (*bat_iface_update_mac)(struct hard_iface *hard_iface); /* called when primary interface is selected / changed */ void (*bat_primary_iface_set)(struct hard_iface *hard_iface);