As Sam Leffler notes, the radiotap header isn't BSD-only, it's also used

by his madwifi Atheros driver on Linux; rename
WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
and change its text name from "ieee-802-11-bsd" to
"ieee-802-11-radiotap".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12429 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index e9adad14a3bbc82885ba8e663301fdb354c1a467..608fdd808bc49932a21485bf53118f6381cd0300 100644 (file)
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -455,5 +455,5 @@ proto_reg_handoff_radiotap(void)
 
     radiotap_handle = create_dissector_handle(dissect_radiotap, proto_radiotap);
 
-    dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_BSD, radiotap_handle);
+    dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP, radiotap_handle);
 }

diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index e58821a82a852ffbd20191c92242a680745bcd85..d36f7f2f1de49808c2be89164d92e08a953b9713 100644 (file)
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -289,7 +289,7 @@ static const struct {
        { 121,          WTAP_ENCAP_HHDLC },     /* HiPath HDLC */
        { 122,          WTAP_ENCAP_IP_OVER_FC },   /* RFC 2625 IP-over-FC */
        { 123,          WTAP_ENCAP_ATM_PDUS },  /* SunATM */
-       { 127,          WTAP_ENCAP_IEEE_802_11_WLAN_BSD },  /* 802.11 plus BSD WLAN header */
+       { 127,          WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP },  /* 802.11 plus radiotap WLAN header */
        { 128,          WTAP_ENCAP_TZSP },      /* Tazmen Sniffer Protocol */
        { 129,          WTAP_ENCAP_ARCNET_LINUX },
 
@@ -1152,7 +1152,7 @@ static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info,
 
        case WTAP_ENCAP_IEEE_802_11:
        case WTAP_ENCAP_PRISM_HEADER:
-       case WTAP_ENCAP_IEEE_802_11_WLAN_BSD:
+       case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP:
        case WTAP_ENCAP_IEEE_802_11_WLAN_AVS:
                /*
                 * We don't know whether there's an FCS in this frame or not.
@@ -1266,7 +1266,7 @@ libpcap_seek_read(wtap *wth, long seek_off,
 
        case WTAP_ENCAP_IEEE_802_11:
        case WTAP_ENCAP_PRISM_HEADER:
-       case WTAP_ENCAP_IEEE_802_11_WLAN_BSD:
+       case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP:
        case WTAP_ENCAP_IEEE_802_11_WLAN_AVS:
                /*
                 * We don't know whether there's an FCS in this frame or not.

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index a58e93fc32d659f99eb43178cac2e771dc012a79..8b0423eb098b07b0fe4e310ce1f2c6ae69645644 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -129,8 +129,8 @@ static const struct encap_type_info {
        /* WTAP_ENCAP_IEEE_802_11_WITH_RADIO */
        { "IEEE 802.11 Wireless LAN with radio information", "ieee-802-11-radio" },
 
-       /* WTAP_ENCAP_IEEE_802_11_WLAN_BSD */
-       { "IEEE 802.11 plus BSD WLAN header", "ieee-802-11-bsd" },
+       /* WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP */
+       { "IEEE 802.11 plus radiotap WLAN header", "ieee-802-11-radiotap" },
 
        /* WTAP_ENCAP_IEEE_802_11_WLAN_AVS */
        { "IEEE 802.11 plus AVS WLAN header", "ieee-802-11-avs" },

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index d624df981f0c9027dd4a384957db74935047dabd..c2157c717dfbb5327d9c15044cc8da9d7fa2acf0 100644 (file)
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -112,7 +112,7 @@
 #define WTAP_ENCAP_IEEE_802_11                 20
 #define WTAP_ENCAP_PRISM_HEADER                        21
 #define WTAP_ENCAP_IEEE_802_11_WITH_RADIO      22
-#define WTAP_ENCAP_IEEE_802_11_WLAN_BSD                23
+#define WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP   23
 #define WTAP_ENCAP_IEEE_802_11_WLAN_AVS                24
 #define WTAP_ENCAP_SLL                         25
 #define WTAP_ENCAP_FRELAY                      26