The following commit has been merged in the merge/master branch: commit 1b756056c6875c1c3e1c47128461fd8e496d73ab Merge: 198948a4d49351fad3caff57ca01ab9266782b27 ccf1183f53baa879cd5a808dbb904f6053fa40f3 Author: Antonio Quartulli ordex@autistici.org Date: Sun May 13 18:12:52 2012 +0200

Merge remote-tracking branch 'origin/standalone/next' into merge/master

diff --combined net/batman-adv/routing.c index 2181a91,4f2059f..4f2059f --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -922,7 -922,8 +922,8 @@@ static int check_unicast_ttvn(struct ba sizeof(struct unicast_packet));

/* we don't have an updated route for this client, so we should - * not try to reroute the packet!! */ + * not try to reroute the packet!! + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) return 1;

diff --combined net/batman-adv/translation-table.c index 88e4c8e,a66c2dc..a66c2dc --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2122,7 -2122,8 +2122,8 @@@ request_table

/* returns true whether we know that the client has moved from its old * originator to another one. This entry is kept is still kept for consistency - * purposes */ + * purposes + */ bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr) { struct tt_global_entry *tt_global_entry; diff --combined net/batman-adv/unicast.c index 62ea9f1,e5c7999..e5c7999 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@@ -395,10 -395,11 +395,11 @@@ find_router

unicast_packet = (struct unicast_packet *)skb->data;

- /* inform the destination ode that we are still missing a correct route + /* inform the destination node that we are still missing a correct route * for this client. The destination will receive this packet and will * try to reroute it because the ttvn contained in the header is less - * than the current one */ + * than the current one + */ if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) unicast_packet->ttvn = unicast_packet->ttvn - 1;