From owner-svn-src-user@FreeBSD.ORG Fri Jan 4 05:51:09 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C462580B; Fri, 4 Jan 2013 05:51:09 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9D55AC1C; Fri, 4 Jan 2013 05:51:09 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r045p9c6064576; Fri, 4 Jan 2013 05:51:09 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r045p9KC064574; Fri, 4 Jan 2013 05:51:09 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201301040551.r045p9KC064574@svn.freebsd.org> From: Adrian Chadd Date: Fri, 4 Jan 2013 05:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245029 - user/adrian/ath_radar_stuff/src/pktlog X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2013 05:51:09 -0000 Author: adrian Date: Fri Jan 4 05:51:08 2013 New Revision: 245029 URL: http://svnweb.freebsd.org/changeset/base/245029 Log: Add radiotap xchannel field support. Modified: user/adrian/ath_radar_stuff/src/pktlog/radiotap.c user/adrian/ath_radar_stuff/src/pktlog/radiotap.h Modified: user/adrian/ath_radar_stuff/src/pktlog/radiotap.c ============================================================================== --- user/adrian/ath_radar_stuff/src/pktlog/radiotap.c Fri Jan 4 05:50:44 2013 (r245028) +++ user/adrian/ath_radar_stuff/src/pktlog/radiotap.c Fri Jan 4 05:51:08 2013 (r245029) @@ -38,6 +38,7 @@ static const struct radiotap_align_size [IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, }, [IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, }, [IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, }, + [IEEE80211_RADIOTAP_XCHANNEL] = { .align = 8, .size = 8 }, [IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, }, /* * add more here as they are defined in radiotap.h Modified: user/adrian/ath_radar_stuff/src/pktlog/radiotap.h ============================================================================== --- user/adrian/ath_radar_stuff/src/pktlog/radiotap.h Fri Jan 4 05:50:44 2013 (r245028) +++ user/adrian/ath_radar_stuff/src/pktlog/radiotap.h Fri Jan 4 05:51:08 2013 (r245029) @@ -175,6 +175,17 @@ struct ieee80211_radiotap_header { * * Number of unicast retries a transmitted frame used. * + * IEEE80211_RADIOTAP_XCHANNEL uint32_t bitmap + * uint16_t MHz + * uint8_t channel number + * int8_t .5 dBm + * + * Extended channel specification: flags (see below) followed by + * frequency in MHz, the corresponding IEEE channel number, and + * finally the maximum regulatory transmit power cap in .5 dBm + * units. This property supersedes IEEE80211_RADIOTAP_CHANNEL + * and only one of the two should be present. + * * IEEE80211_RADIOTAP_MCS u8, u8, u8 unitless * * Contains a bitmap of known fields/flags, the flags, and @@ -203,7 +214,7 @@ enum ieee80211_radiotap_type { IEEE80211_RADIOTAP_TX_FLAGS = 15, IEEE80211_RADIOTAP_RTS_RETRIES = 16, IEEE80211_RADIOTAP_DATA_RETRIES = 17, - + IEEE80211_RADIOTAP_XCHANNEL = 18, IEEE80211_RADIOTAP_MCS = 19, IEEE80211_RADIOTAP_AMPDU_STATUS = 20, @@ -222,6 +233,9 @@ enum ieee80211_radiotap_type { #define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */ #define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */ #define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */ +#define IEEE80211_CHAN_HT20 0x00010000 /* HT 20 channel */ +#define IEEE80211_CHAN_HT40U 0x00020000 /* HT 40 channel w/ ext above */ +#define IEEE80211_CHAN_HT40D 0x00040000 /* HT 40 channel w/ ext below */ /* For IEEE80211_RADIOTAP_FLAGS */ #define IEEE80211_RADIOTAP_F_CFP 0x01 /* sent/received