Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f80df6705fcd8153f93bd0e82109dbeb7ff535b

Authored by Antonio Quartulli
Committed by Antonio Quartulli
1 parent eb2deb6b39

batman-adv: print the VID properly 

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 <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

Showing 1 changed file with 21 additions and 16 deletions Side-by-side Diff

net/batman-adv/bridge_loop_avoidance.c
Diff comments   View file @ 5f80df6
... ... @@ -307,7 +307,8 @@
307 307 */
308 308 memcpy(ethhdr->h_source, mac, ETH_ALEN);
309 309 batadv_dbg(BATADV_DBG_BLA, bat_priv,
310   - "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);
  310 + "bla_send_claim(): CLAIM %pM on vid %d\n", mac,
  311 + BATADV_PRINT_VID(vid));
311 312 break;
312 313 case BATADV_CLAIM_TYPE_UNCLAIM:
313 314 /* unclaim frame
... ... @@ -316,7 +317,7 @@
316 317 memcpy(hw_src, mac, ETH_ALEN);
317 318 batadv_dbg(BATADV_DBG_BLA, bat_priv,
318 319 "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,
319   - vid);
  320 + BATADV_PRINT_VID(vid));
320 321 break;
321 322 case BATADV_CLAIM_TYPE_ANNOUNCE:
322 323 /* announcement frame
... ... @@ -325,7 +326,7 @@
325 326 memcpy(hw_src, mac, ETH_ALEN);
326 327 batadv_dbg(BATADV_DBG_BLA, bat_priv,
327 328 "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
328   - ethhdr->h_source, vid);
  329 + ethhdr->h_source, BATADV_PRINT_VID(vid));
329 330 break;
330 331 case BATADV_CLAIM_TYPE_REQUEST:
331 332 /* request frame
... ... @@ -336,7 +337,8 @@
336 337 memcpy(ethhdr->h_dest, mac, ETH_ALEN);
337 338 batadv_dbg(BATADV_DBG_BLA, bat_priv,
338 339 "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n",
339   - ethhdr->h_source, ethhdr->h_dest, vid);
  340 + ethhdr->h_source, ethhdr->h_dest,
  341 + BATADV_PRINT_VID(vid));
340 342 break;
341 343 }
342 344  
... ... @@ -381,7 +383,7 @@
381 383  
382 384 batadv_dbg(BATADV_DBG_BLA, bat_priv,
383 385 "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
384   - orig, vid);
  386 + orig, BATADV_PRINT_VID(vid));
385 387  
386 388 entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
387 389 if (!entry)
... ... @@ -573,7 +575,7 @@
573 575 atomic_set(&claim->refcount, 2);
574 576 batadv_dbg(BATADV_DBG_BLA, bat_priv,
575 577 "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
576   - mac, vid);
  578 + mac, BATADV_PRINT_VID(vid));
577 579 hash_added = batadv_hash_add(bat_priv->bla.claim_hash,
578 580 batadv_compare_claim,
579 581 batadv_choose_claim, claim,
... ... @@ -592,7 +594,7 @@
592 594  
593 595 batadv_dbg(BATADV_DBG_BLA, bat_priv,
594 596 "bla_add_claim(): changing ownership for %pM, vid %d\n",
595   - mac, vid);
  597 + mac, BATADV_PRINT_VID(vid));
596 598  
597 599 claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
598 600 batadv_backbone_gw_free_ref(claim->backbone_gw);
... ... @@ -623,7 +625,7 @@
623 625 return;
624 626  
625 627 batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
626   - mac, vid);
  628 + mac, BATADV_PRINT_VID(vid));
627 629  
628 630 batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
629 631 batadv_choose_claim, claim);
630 632  
... ... @@ -659,12 +661,13 @@
659 661  
660 662 batadv_dbg(BATADV_DBG_BLA, bat_priv,
661 663 "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",
662   - vid, backbone_gw->orig, crc);
  664 + BATADV_PRINT_VID(vid), backbone_gw->orig, crc);
663 665  
664 666 if (backbone_gw->crc != crc) {
665 667 batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
666 668 "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",
667   - backbone_gw->orig, backbone_gw->vid,
  669 + backbone_gw->orig,
  670 + BATADV_PRINT_VID(backbone_gw->vid),
668 671 backbone_gw->crc, crc);
669 672  
670 673 batadv_bla_send_request(backbone_gw);
... ... @@ -700,7 +703,7 @@
700 703  
701 704 batadv_dbg(BATADV_DBG_BLA, bat_priv,
702 705 "handle_request(): REQUEST vid %d (sent by %pM)...\n",
703   - vid, ethhdr->h_source);
  706 + BATADV_PRINT_VID(vid), ethhdr->h_source);
704 707  
705 708 batadv_bla_answer_request(bat_priv, primary_if, vid);
706 709 return 1;
... ... @@ -728,7 +731,7 @@
728 731 /* this must be an UNCLAIM frame */
729 732 batadv_dbg(BATADV_DBG_BLA, bat_priv,
730 733 "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
731   - claim_addr, vid, backbone_gw->orig);
  734 + claim_addr, BATADV_PRINT_VID(vid), backbone_gw->orig);
732 735  
733 736 batadv_bla_del_claim(bat_priv, claim_addr, vid);
734 737 batadv_backbone_gw_free_ref(backbone_gw);
... ... @@ -912,7 +915,8 @@
912 915 if (ret == 1)
913 916 batadv_dbg(BATADV_DBG_BLA, bat_priv,
914 917 "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
915   - ethhdr->h_source, vid, hw_src, hw_dst);
  918 + ethhdr->h_source, BATADV_PRINT_VID(vid), hw_src,
  919 + hw_dst);
916 920  
917 921 if (ret < 2)
918 922 return ret;
... ... @@ -947,7 +951,7 @@
947 951  
948 952 batadv_dbg(BATADV_DBG_BLA, bat_priv,
949 953 "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
950   - ethhdr->h_source, vid, hw_src, hw_dst);
  954 + ethhdr->h_source, BATADV_PRINT_VID(vid), hw_src, hw_dst);
951 955 return 1;
952 956 }
953 957  
... ... @@ -1628,7 +1632,7 @@
1628 1632 is_own = batadv_compare_eth(claim->backbone_gw->orig,
1629 1633 primary_addr);
1630 1634 seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",
1631   - claim->addr, claim->vid,
  1635 + claim->addr, BATADV_PRINT_VID(claim->vid),
1632 1636 claim->backbone_gw->orig,
1633 1637 (is_own ? 'x' : ' '),
1634 1638 claim->backbone_gw->crc);
... ... @@ -1681,7 +1685,8 @@
1681 1685 continue;
1682 1686  
1683 1687 seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n",
1684   - backbone_gw->orig, backbone_gw->vid, secs,
  1688 + backbone_gw->orig,
  1689 + BATADV_PRINT_VID(backbone_gw->vid), secs,
1685 1690 msecs, backbone_gw->crc);
1686 1691 }
1687 1692 rcu_read_unlock();