aboutsummaryrefslogtreecommitdiffstats
path: root/pcap-linux.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-08-06 14:58:16 -0700
committerGuy Harris <guy@alum.mit.edu>2010-08-06 14:58:16 -0700
commit3c13ac2cc3e06899a8ed1aca3e88b2abebb02c9a (patch)
tree2be951b6e735c34a097e64ece71cdd6311bd8a61 /pcap-linux.c
parentf41d444406262893cf2ccea847a0fd12182a43f9 (diff)
Fix previous checkin.
Diffstat (limited to 'pcap-linux.c')
-rw-r--r--pcap-linux.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/pcap-linux.c b/pcap-linux.c
index b9381e8..81bc8d3 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -2301,14 +2301,6 @@ pcap_setdirection_linux(pcap_t *handle, pcap_direction_t d)
return -1;
}
-#ifndef ARPHRD_IEEE802154
-#define ARPHRD_IEEE802154 804
-#endif
- case ARPHRD_IEEE802154:
- handle->linktype = DLT_IEEE802_15_4_NOFCS;
- break;
-
-
#ifdef HAVE_PF_PACKET_SOCKETS
/*
* Map the PACKET_ value to a LINUX_SLL_ value; we
@@ -2655,6 +2647,13 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype, int cooked_ok)
handle->linktype = DLT_RAW;
break;
+#ifndef ARPHRD_IEEE802154
+#define ARPHRD_IEEE802154 804
+#endif
+ case ARPHRD_IEEE802154:
+ handle->linktype = DLT_IEEE802_15_4_NOFCS;
+ break;
+
default:
handle->linktype = -1;
break;