ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-medsa.c

diff --git a/print-medsa.c b/print-medsa.c
index 8161012bf110147d71db7e14c850b243dd880ee1..655cd01c084169e61750e1c19dc59cb9ab021a33 100644 (file)
--- a/print-medsa.c
+++ b/print-medsa.c
@@ -32,12 +32,11 @@
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 

-static const char tstr[] = "[|MEDSA]";

 
 /*
  * Marvell Extended Distributed Switch Archiecture.
  *
 
 /*
  * Marvell Extended Distributed Switch Archiecture.
  *

- * A Marvell propriatary header used for passing packets to/from
+ * A Marvell proprietary header used for passing packets to/from

  * specific ports of a switch. There is no open specification of this
  * header, but is documented in the Marvell Switch data sheets. For
  * background, see:
  * specific ports of a switch. There is no open specification of this
  * header, but is documented in the Marvell Switch data sheets. For
  * background, see:


@@ -69,8 +68,8 @@ struct        medsa_pkthdr {
 #define CODE_ARP_MIRROR        4
 #define CFI(medsa)     (EXTRACT_U_1(medsa->port_trunc_codehi_cfi) & 0x01)
 #define PRI(medsa)     (EXTRACT_U_1(medsa->pri_vidhi_codelo) >> 5)
 #define CODE_ARP_MIRROR        4
 #define CFI(medsa)     (EXTRACT_U_1(medsa->port_trunc_codehi_cfi) & 0x01)
 #define PRI(medsa)     (EXTRACT_U_1(medsa->pri_vidhi_codelo) >> 5)

-#define VID(medsa)     (((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 |  \
-                         EXTRACT_U_1(medsa->vidlo)))
+#define VID(medsa)     ((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 |   \
+                         EXTRACT_U_1(medsa->vidlo))

 
 static const struct tok tag_values[] = {
        { TAG_TO_CPU, "To_CPU" },
 
 static const struct tok tag_values[] = {
        { TAG_TO_CPU, "To_CPU" },


@@ -147,6 +146,7 @@ medsa_print(netdissect_options *ndo,
        const struct medsa_pkthdr *medsa;
        u_short ether_type;
 
        const struct medsa_pkthdr *medsa;
        u_short ether_type;
 

+       ndo->ndo_protocol = "medsa";

        medsa = (const struct medsa_pkthdr *)bp;
        ND_TCHECK_SIZE(medsa);
 
        medsa = (const struct medsa_pkthdr *)bp;
        ND_TCHECK_SIZE(medsa);
 


@@ -188,12 +188,5 @@ medsa_print(netdissect_options *ndo,
        }
        return;
 trunc:
        }
        return;
 trunc:

-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);

 }
 }

-
-/*
- * Local Variables:
- * c-style: bsd
- * End:
- */
-