Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

diff --git a/print-802_11.c b/print-802_11.c
index 4f76a4aa7c799c87c749e493768881dd31143814..697e2c92600078769cf449b9d913fd52d14fc6c4 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -1187,9 +1187,7 @@ static const char *status_text[] = {
        "The request has not been successful as one or more parameters "
          "have invalid values",                                /* 38 */
        "The TS has not been created because the request cannot be honored. "
-         "However, a suggested TSPEC is provided so that the initiating QSTA"
-         "may attempt to set another TS with the suggested changes to the "
-         "TSPEC",                                              /* 39 */
+         "Try again with the suggested changes to the TSPEC",  /* 39 */
        "Invalid Information Element",                          /* 40 */
        "Group Cipher is not valid",                            /* 41 */
        "Pairwise Cipher is not valid",                         /* 42 */

diff --git a/print-lldp.c b/print-lldp.c
index 3564e568cdf773e7a9de557d58d8b492e2f08ed6..e499507bba7e80d7b082aa294d2695e0967dfc0c 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -1180,9 +1180,12 @@ lldp_private_dcbx_print(netdissect_options *ndo,
            ND_PRINT((ndo, "\n\t      SubType: %d", *(tptr + 3)));
            ND_PRINT((ndo, "\n\t      Priority Allocation"));
 
+           /*
+            * Array of 8 4-bit priority group ID values; we fetch all
+            * 32 bits and extract each nibble.
+            */
            pgval = EXTRACT_32BITS(tptr+4);
            for (i = 0; i <= 7; i++) {
-               tval = *(tptr+4+(i/2));
                ND_PRINT((ndo, "\n\t          PgId_%d: %d",
                        i, (pgval >> (28 - 4 * i)) & 0xF));
            }