diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-11-19 10:45:58 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-11-19 10:45:58 -0800 |
commit | dafc654f7fb5a9eba8c55abb61bb004b9bc060ad (patch) | |
tree | 5bf39957a81ab8f93e0b42a35dfc2bc6d6805d69 | |
parent | eeb0348fe8d74800af37759618270fb8bed17443 (diff) | |
parent | cda7f7d20a9f02f7ca40dae6557c0f029a187a63 (diff) |
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/libpcap
This merge is necessary because this isn't SVN and "commit" and "push to
official repository" are separate operations, so, when you do a push, it
apparently needs a commit to merge your changes with other changes.
-rw-r--r-- | pcap-linux.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pcap-linux.c b/pcap-linux.c index 6c0723ab..69097ac7 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -2604,6 +2604,8 @@ map_packet_type_to_sll_type(short int sll_pkttype) */ static void map_arphrd_to_dlt(pcap_t *handle, int arptype, int cooked_ok) { + struct pcap_linux *handlep = handle->priv; + switch (arptype) { case ARPHRD_ETHER: |