Commit 5e5f65b2 authored by Robert David Graham's avatar Robert David Graham
Browse files

vlan

parent ba621b1c

src/pixie-timer.h

+1 −1
Original line number Diff line number Diff line 
#ifndef TIMER_H

#ifndef PIXIE_TIMER_H

#define PIXIE_TIMER_H

#include <stdint.h>

src/rawsock-arp.c

+4 −1
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ arp_resolve_sync(struct Adapter *adapter, 
        /*

         * Parse the response as an ARP packet

         */

        if (adapter->is_vlan)

            proto_arp_parse(&response, px, 16, length);

        else

            proto_arp_parse(&response, px, 14, length);



        /* Is this an ARP packet? */