The following commit has been merged in the master branch: commit 4c66b7d492b5f5d2931818ba7bdeb0d415b87b3a Author: Simon Wunderlich simon.wunderlich@s2003.tu-chemnitz.de Date: Sat Jun 23 12:34:17 2012 +0200

batman-adv: correct comments in bridge loop avoidance

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 1e2cfe5..2899104 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -280,7 +280,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, NULL, /* Ethernet SRC/HW SRC: originator mac */ primary_if->net_dev->dev_addr, - /* HW DST: FF:43:05:XX:00:00 + /* HW DST: FF:43:05:XX:YY:YY * with XX = claim type * and YY:YY = group id */ @@ -322,7 +322,8 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, break; case BATADV_CLAIM_TYPE_REQUEST: /* request frame - * set HW SRC to the special mac containg the crc + * set HW SRC and header destination to the receiving backbone + * gws mac */ memcpy(hw_src, mac, ETH_ALEN); memcpy(ethhdr->h_dest, mac, ETH_ALEN);