From: Antonio Quartulli anto...@open-mesh.com
Since the MSB bits of any vid variable are now used for
storing flags, print the vid properly by taking the flags
away and printing -1 in case of VID representing no real
VLAN.
Signed-off-by: Antonio Quartulli anto...@open-mesh.com
---
bridge_loop_avoidance.c | 36
main.h | 2 ++
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index d75fb80..fc0f29c 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -307,7 +307,8 @@ static void batadv_bla_send_claim(struct batadv_priv
*bat_priv, uint8_t *mac,
*/
memcpy(ethhdr-h_source, mac, ETH_ALEN);
batadv_dbg(BATADV_DBG_BLA, bat_priv,
- bla_send_claim(): CLAIM %pM on vid %d\n, mac, vid);
+ bla_send_claim(): CLAIM %pM on vid %d\n, mac,
+ BATADV_PRINT_VID(vid));
break;
case BATADV_CLAIM_TYPE_UNCLAIM:
/* unclaim frame
@@ -316,7 +317,7 @@ static void batadv_bla_send_claim(struct batadv_priv
*bat_priv, uint8_t *mac,
memcpy(hw_src, mac, ETH_ALEN);
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_send_claim(): UNCLAIM %pM on vid %d\n, mac,
- vid);
+ BATADV_PRINT_VID(vid));
break;
case BATADV_CLAIM_TYPE_ANNOUNCE:
/* announcement frame
@@ -325,7 +326,7 @@ static void batadv_bla_send_claim(struct batadv_priv
*bat_priv, uint8_t *mac,
memcpy(hw_src, mac, ETH_ALEN);
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_send_claim(): ANNOUNCE of %pM on vid %d\n,
- ethhdr-h_source, vid);
+ ethhdr-h_source, BATADV_PRINT_VID(vid));
break;
case BATADV_CLAIM_TYPE_REQUEST:
/* request frame
@@ -336,7 +337,8 @@ static void batadv_bla_send_claim(struct batadv_priv
*bat_priv, uint8_t *mac,
memcpy(ethhdr-h_dest, mac, ETH_ALEN);
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_send_claim(): REQUEST of %pM to %pM on vid
%d\n,
- ethhdr-h_source, ethhdr-h_dest, vid);
+ ethhdr-h_source, ethhdr-h_dest,
+ BATADV_PRINT_VID(vid));
break;
}
@@ -380,7 +382,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv,
uint8_t *orig,
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_get_backbone_gw(): not found (%pM, %d), creating new
entry\n,
- orig, vid);
+ orig, BATADV_PRINT_VID(vid));
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (!entry)
@@ -572,7 +574,7 @@ static void batadv_bla_add_claim(struct batadv_priv
*bat_priv,
atomic_set(claim-refcount, 2);
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_add_claim(): adding new entry %pM, vid %d to
hash ...\n,
- mac, vid);
+ mac, BATADV_PRINT_VID(vid));
hash_added = batadv_hash_add(bat_priv-bla.claim_hash,
batadv_compare_claim,
batadv_choose_claim, claim,
@@ -591,7 +593,7 @@ static void batadv_bla_add_claim(struct batadv_priv
*bat_priv,
batadv_dbg(BATADV_DBG_BLA, bat_priv,
bla_add_claim(): changing ownership for %pM, vid
%d\n,
- mac, vid);
+ mac, BATADV_PRINT_VID(vid));
claim-backbone_gw-crc ^= crc16(0, claim-addr, ETH_ALEN);
batadv_backbone_gw_free_ref(claim-backbone_gw);
@@ -622,7 +624,7 @@ static void batadv_bla_del_claim(struct batadv_priv
*bat_priv,
return;
batadv_dbg(BATADV_DBG_BLA, bat_priv, bla_del_claim(): %pM, vid %d\n,
- mac, vid);
+ mac, BATADV_PRINT_VID(vid));
batadv_hash_remove(bat_priv-bla.claim_hash, batadv_compare_claim,
batadv_choose_claim, claim);
@@ -658,12 +660,12 @@ static int batadv_handle_announce(struct batadv_priv
*bat_priv,
batadv_dbg(BATADV_DBG_BLA, bat_priv,
handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC =
%#.4x\n,
- vid, backbone_gw-orig, crc);
+ BATADV_PRINT_VID(vid), backbone_gw-orig, crc);
if (backbone_gw-crc != crc) {
batadv_dbg(BATADV_DBG_BLA, backbone_gw-bat_priv,
handle_announce(): CRC FAILED for %pM/%d (my =
%#.4x, sent = %#.4x)\n,
- backbone_gw-orig, backbone_gw-vid,
+
