From 62da7bf7d9cfcf9db87f07cd64b01305b73261bb Mon Sep 17 00:00:00 2001 From: Simon Wunderlich Date: Sat, 23 Jun 2012 12:34:17 +0200 Subject: [PATCH] --- yaml --- r: 327597 b: refs/heads/master c: 99e966fc969360bed8d3bb71c144fa10ba7a12d0 h: refs/heads/master i: 327595: ba9bad4ebc0adc9b3ba0d3e302f817adb5b93fa3 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/bridge_loop_avoidance.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f8757e75725a..9995f745a992 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 536a23f119e35e58c762a219bafd398ba2ed7980 +refs/heads/master: 99e966fc969360bed8d3bb71c144fa10ba7a12d0 diff --git a/trunk/net/batman-adv/bridge_loop_avoidance.c b/trunk/net/batman-adv/bridge_loop_avoidance.c index 7e60466f5718..5f1ad80d5163 100644 --- a/trunk/net/batman-adv/bridge_loop_avoidance.c +++ b/trunk/net/batman-adv/bridge_loop_avoidance.c @@ -281,7 +281,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 */ @@ -323,7 +323,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);