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

batctl: rename bridge loop avoidance claim types

for consistency reasons within the code and with the documentation, we should always call it "claim" and "unclaim".

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

diff --git a/packet.h b/packet.h index 8d3e55a..65d66e4 100644 --- a/packet.h +++ b/packet.h @@ -92,8 +92,8 @@ enum batadv_tt_client_flags {

/* claim frame types for the bridge loop avoidance */ enum batadv_bla_claimframe { - BATADV_CLAIM_TYPE_ADD = 0x00, - BATADV_CLAIM_TYPE_DEL = 0x01, + BATADV_CLAIM_TYPE_CLAIM = 0x00, + BATADV_CLAIM_TYPE_UNCLAIM = 0x01, BATADV_CLAIM_TYPE_ANNOUNCE = 0x02, BATADV_CLAIM_TYPE_REQUEST = 0x03, }; diff --git a/tcpdump.c b/tcpdump.c index cbae9bb..489132f 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -118,14 +118,14 @@ static int dump_bla2_claim(struct ether_header *eth_hdr, goto out;

switch (bla_dst->type) { - case BATADV_CLAIM_TYPE_ADD: + case BATADV_CLAIM_TYPE_CLAIM: printf("BLA CLAIM, backbone %s, ", get_name_by_macaddr((struct ether_addr *)hw_src, read_opt)); printf("client %s, bla group %04x\n", get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt), ntohs(bla_dst->group)); break; - case BATADV_CLAIM_TYPE_DEL: + case BATADV_CLAIM_TYPE_UNCLAIM: printf("BLA UNCLAIM, backbone %s, ", get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt)); printf("client %s, bla group %04x\n",