Merge remote-tracking branch 'upstream/master'

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 106e6fd3111abd173fdd49418bbc18148047e821..b6fa52236695daa3df5c19d5e8cddec89799bb0b 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -210,7 +210,7 @@ gre_print_0(const u_char *bp, u_int length)
                break;
 #ifdef INET6
        case ETHERTYPE_IPV6:
                break;
 #ifdef INET6
        case ETHERTYPE_IPV6:

-               ip6_print(bp, len);
+               ip6_print(gndo, bp, len);

                break;
 #endif
        case ETHERTYPE_MPLS:
                break;
 #endif
        case ETHERTYPE_MPLS:


@@ -226,7 +226,7 @@ gre_print_0(const u_char *bp, u_int length)
                isoclns_print(bp, len, len);
                break;
        case ETHERTYPE_TEB:
                isoclns_print(bp, len, len);
                break;
        case ETHERTYPE_TEB:

-               ether_print(bp, len, len, NULL, NULL);
+               ether_print(gndo, bp, len, len, NULL, NULL);

                break;
        default:
                printf("gre-proto-0x%x", prot);
                break;
        default:
                printf("gre-proto-0x%x", prot);