The following commit has been merged in the next branch: commit ccf1183f53baa879cd5a808dbb904f6053fa40f3 Author: Antonio Quartulli ordex@autistici.org Date: Sat May 12 14:38:01 2012 +0200

batman-adv: fix comment style and typo

Fix to David's style

Introduced by b46c60b9e1ee7a1909c542413a85875a750955d6

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/routing.c b/routing.c index 2181a91..4f2059f 100644 --- a/routing.c +++ b/routing.c @@ -922,7 +922,8 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, 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 --git a/translation-table.c b/translation-table.c index 88e4c8e..a66c2dc 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2122,7 +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 --git a/unicast.c b/unicast.c index 62ea9f1..e5c7999 100644 --- a/unicast.c +++ b/unicast.c @@ -395,10 +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;