diff options
| author | Xin LI <delphij@FreeBSD.org> | 2017-02-13 08:23:39 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2017-02-13 08:23:39 +0000 |
| commit | ada6f083b93b4adce9c3b3ba00112528244a3b86 (patch) | |
| tree | cb89d2b7657c6b206bb28e5a9ab17ef556d64986 /lib/libpcap/pcap-netmap.c | |
| parent | 5dbc2ac93dbe46c66b0159f9cbf67146ae43656d (diff) | |
| parent | c8c6d70e300aa9261c4766502c179fc4cd2b22a0 (diff) | |
MFV r313676: libpcap 1.8.1
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=313695
Diffstat (limited to 'lib/libpcap/pcap-netmap.c')
| -rw-r--r-- | lib/libpcap/pcap-netmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libpcap/pcap-netmap.c b/lib/libpcap/pcap-netmap.c index 19af71eed8ad..31f23569df89 100644 --- a/lib/libpcap/pcap-netmap.c +++ b/lib/libpcap/pcap-netmap.c @@ -209,13 +209,13 @@ static int pcap_netmap_activate(pcap_t *p) { struct pcap_netmap *pn = NM_PRIV(p); - struct nm_desc *d = nm_open(p->opt.source, NULL, 0, NULL); + struct nm_desc *d = nm_open(p->opt.device, NULL, 0, NULL); uint32_t if_flags = 0; if (d == NULL) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "netmap open: cannot access %s: %s\n", - p->opt.source, pcap_strerror(errno)); + p->opt.device, pcap_strerror(errno)); #ifdef HAVE_NO_PRIV free(pn); SET_PRIV(p, NULL); // unnecessary @@ -225,7 +225,7 @@ pcap_netmap_activate(pcap_t *p) } if (0) fprintf(stderr, "%s device %s priv %p fd %d ports %d..%d\n", - __FUNCTION__, p->opt.source, d, d->fd, + __FUNCTION__, p->opt.device, d, d->fd, d->first_rx_ring, d->last_rx_ring); pn->d = d; p->fd = d->fd; @@ -274,7 +274,7 @@ pcap_netmap_create(const char *device, char *ebuf, int *is_ours) SET_PRIV(p, pn); } #else - p = pcap_create_common(device, ebuf, sizeof (struct pcap_netmap)); + p = pcap_create_common(ebuf, sizeof (struct pcap_netmap)); if (p == NULL) return (NULL); #endif |