diff options
Diffstat (limited to 'include/net/ieee80211_radiotap.h')
-rw-r--r-- | include/net/ieee80211_radiotap.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h index d364fd594ea4..384698cb773a 100644 --- a/include/net/ieee80211_radiotap.h +++ b/include/net/ieee80211_radiotap.h | |||
@@ -1,7 +1,4 @@ | |||
1 | /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */ | 1 | /* |
2 | /* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */ | ||
3 | |||
4 | /*- | ||
5 | * Copyright (c) 2003, 2004 David Young. All rights reserved. | 2 | * Copyright (c) 2003, 2004 David Young. All rights reserved. |
6 | * | 3 | * |
7 | * Redistribution and use in source and binary forms, with or without | 4 | * Redistribution and use in source and binary forms, with or without |
@@ -42,8 +39,6 @@ | |||
42 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
43 | #include <asm/unaligned.h> | 40 | #include <asm/unaligned.h> |
44 | 41 | ||
45 | /* Radiotap header version (from official NetBSD feed) */ | ||
46 | #define IEEE80211RADIOTAP_VERSION "1.5" | ||
47 | /* Base version of the radiotap packet header data */ | 42 | /* Base version of the radiotap packet header data */ |
48 | #define PKTHDR_RADIOTAP_VERSION 0 | 43 | #define PKTHDR_RADIOTAP_VERSION 0 |
49 | 44 | ||
@@ -62,12 +57,8 @@ | |||
62 | * readers. | 57 | * readers. |
63 | */ | 58 | */ |
64 | 59 | ||
65 | /* XXX tcpdump/libpcap do not tolerate variable-length headers, | 60 | /* |
66 | * yet, so we pad every radiotap header to 64 bytes. Ugh. | 61 | * The radio capture header precedes the 802.11 header. |
67 | */ | ||
68 | #define IEEE80211_RADIOTAP_HDRLEN 64 | ||
69 | |||
70 | /* The radio capture header precedes the 802.11 header. | ||
71 | * All data in the header is little endian on all platforms. | 62 | * All data in the header is little endian on all platforms. |
72 | */ | 63 | */ |
73 | struct ieee80211_radiotap_header { | 64 | struct ieee80211_radiotap_header { |