diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2023-03-31 19:01:44 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2023-03-31 19:02:22 +0000 |
| commit | 6f9cba8f8b5efd16249633e52483ea351876b67b (patch) | |
| tree | 544c9dc831f12dad8ce0bf0af943eb68d07a845f /contrib/libpcap/pcap/can_socketcan.h | |
| parent | d860991a7289c673d19467ea7faae46df7681db1 (diff) | |
| parent | 35af88c96350eb786f1198dfb6b29a171016e6bf (diff) | |
| download | src-6f9cba8f8b5efd16249633e52483ea351876b67b.tar.gz src-6f9cba8f8b5efd16249633e52483ea351876b67b.zip | |
libpcap: Update to 1.10.3
Local changes:
- In contrib/libpcap/pcap/bpf.h, do not include pcap/dlt.h. Our system
net/dlt.h is pulled in from net/bpf.h.
- sys/net/dlt.h: Incorporate changes from libpcap 1.10.3.
- lib/libpcap/Makefile: Update for libpcap 1.10.3.
Changelog: https://git.tcpdump.org/libpcap/blob/95691ebe7564afa3faa5c6ba0dbd17e351be455a:/CHANGES
Reviewed by: emaste
Obtained from: https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'contrib/libpcap/pcap/can_socketcan.h')
| -rw-r--r-- | contrib/libpcap/pcap/can_socketcan.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/libpcap/pcap/can_socketcan.h b/contrib/libpcap/pcap/can_socketcan.h index 332d9ff5d5a9..0cb3584a8497 100644 --- a/contrib/libpcap/pcap/can_socketcan.h +++ b/contrib/libpcap/pcap/can_socketcan.h @@ -48,9 +48,14 @@ typedef struct { uint32_t can_id; uint8_t payload_length; - uint8_t pad; + uint8_t fd_flags; uint8_t reserved1; uint8_t reserved2; } pcap_can_socketcan_hdr; +/* Bits in the fd_flags field */ +#define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ +#define CANFD_ESI 0x02 /* error state indicator of the transmitting node */ +#define CANFD_FDF 0x04 /* mark CAN FD for dual use of CAN format */ + #endif |