Skip to contentSkip to conversation

Radiotap injection for any Mode

PATCH In review [email protected] 3 participants 8 messages Jun 24, 2007

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover Radiotap injection for any Mode

These patches add the ability to inject encapsulated packets down an interface for transmission according to a prepended radiotap header.

For injecting packets, the you issue a packet using libpcap or a SOCK_PACKET socket down an interface to the wireless device that is in any Mode. The packet has a 14 byte ethhdr of protocol type ETH_P_80211_RT encapsulating a normal radiotap header prepended to the IEEE80211 header and payload. The radiotap header is variable length depending on what the user wants to specify, currently the transmit rate, power and antenna can be specified using normal radiotap semantics. Any other entries are skipped.

The radiotap parser is broken out into its own file under cfg80211.

A usermode app packetspammer is available from here

http://penumbra.warmcat.com/_twk/tiki-index.php?page=packetspammer
http://git.warmcat.com/?p=packetspammer.git;a=summary

which allows easy injection of these packets from the commandline. At the moment it loops issuing packets at a variety of rates which can be seen from another machine's monitor mode interface on the same channel. There are instructions for build and using it on the page above along with Fedora 7 binary and source RPMS. There is now also a -f switch to allow testing of the FCS flag on injected packets.

Currently it has been tested for both rx and tx using zd1211rw-mac80211.

The patches are based against current wireless-dev.

I also added some documentation files which explains how to use the injection functionality and radiotap header notes.

Thanks to Michael Wu and Johannes Berg for review and bugfinding.

#1 lore raw

PATCH 1/4 mac80211: Monitor mode radiotap injection docs

Try #14
- Documented Jiri Benc's injection encapsulation method

Try #lucky13
- Johannes Berg's suggested use of get_unaligned() to protect unaligned defreferences of all multibyte radiotap stuff

CC John Linville <[email protected]>
CC Johannes Berg <[email protected]>
CC Jiri Benc <[email protected]>
---
 Documentation/networking/mac80211-injection.txt |   88 ++++++++++++++++++++++++
 Documentation/networking/radiotap-headers.txt   |   87 +++++++++++++++++++++++
 2 files changed, 175 insertions(+)
Documentation/networking/mac80211-injection.txt new file +88 -0
Index: wireless-dev/Documentation/networking/mac80211-injection.txt
===================================================================
@@ -0,0 +1,88 @@
+How to use packet injection with mac80211
+=========================================
+
+mac80211 now allows arbitrary packets to be injected down any interface from
+userland.  The packet you inject needs to be composed in the following format:
+
+ [ encapsulating ethhdr ]
+ [ radiotap header  ]
+ [ ieee80211 header ]
+ [ payload ]
+
+The interface can be in any ieee80211 mode (Managed, Monitor), but currently
+Managed mode rejects packets before mac80211 if the interface is not
+associated.  Monitor Mode interfaces accept packets for injection even when
+no other interface on the device is associated though.
+
+Encapsulating ethhdr
+--------------------
+
+First the encapsulating ethernet header is a simple fixed struct ethhdr:
+
+	0xXX, 0xXX, 0xXX, 0xXX, 0xXX, 0xXX  // dest eth addr (ignored)
+	0xXX, 0xXX, 0xXX, 0xXX, 0xXX, 0xXX  // source eth addr (ignored)
+	0x00, 0x1B
+
+(The dest and src addr are ignored by the injection code, but the kernel
+networking code can be interested in them for eg, bridging, recommended values
+are TBD).
+
+Radiotap Header
+---------------
+
+The radiotap format is discussed in
+./Documentation/networking/radiotap-headers.txt.
+
+Despite 13 radiotap argument types are currently defined, most only make sense
+to appear on received packets.  Currently three kinds of argument are used by
+the injection code, although it knows to skip any other arguments that are
+present (facilitating replay of captured radiotap headers directly):
+
+ - IEEE80211_RADIOTAP_RATE - u8 arg in 500kbps units (0x02 --> 1Mbps)
+
+ - IEEE80211_RADIOTAP_ANTENNA - u8 arg, 0x00 = ant1, 0x01 = ant2
+
+ - IEEE80211_RADIOTAP_DBM_TX_POWER - u8 arg, dBm
+
+Here is an example valid radiotap header defining these three parameters
+
+	0x00, 0x00, // <-- radiotap version
+	0x0b, 0x00, // <- radiotap header length
+	0x04, 0x0c, 0x00, 0x00, // <-- bitmap
+	0x6c, // <-- rate
+	0x0c, //<-- tx power
+	0x01 //<-- antenna
+
+
+ieee80211 header
+----------------
+
+The ieee80211 header follows immediately afterwards, looking for example like
+this:
+
+	0x08, 0x01, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x13, 0x22, 0x33, 0x44, 0x55, 0x66,
+	0x13, 0x22, 0x33, 0x44, 0x55, 0x66,
+	0x10, 0x86
+
+Then lastly there is the payload.
+
+
+Delivering the packet from usermode
+-----------------------------------
+
+After composing the packet contents, it is sent by send()-ing it to a logical
+mac80211 interface that is in Monitor mode.  Libpcap can also be used,
+(which is easier than doing the work to bind the socket to the right
+interface), along the following lines:
+
+	ppcap = pcap_open_live(szInterfaceName, 800, 1, 20, szErrbuf);
+...
+	r = pcap_inject(ppcap, u8aSendBuffer, nLength);
+
+You can also find sources for a complete inject test applet here:
+
+http://penumbra.warmcat.com/_twk/tiki-index.php?page=packetspammer
+
+Andy Green <[email protected]>
Documentation/networking/radiotap-headers.txt new file +87 -0

87 lines not on this page · raw message

maintainer
#2 lore raw

Re: [PATCH Try#14 1/4] mac80211: Monitor mode radiotap injection docs

Quoted 3 lines · On Sun, 2007-06-24 at 09:57 +0100, [email protected] wrote:

plain text document attachment (mac80211-docs-radiotap-usage.patch) Try #14
- Documented Jiri Benc's injection encapsulation method

I still don't see the point since we've previously established that it won't help on other interfaces (qdiscs, ...); for monitor interfaces #13 is enough and much simpler.

I'd vote for applying #13.

johannes

#3 lore raw

Re: [PATCH Try#14 1/4] mac80211: Monitor mode radiotap injection docs

Quoted 4 lines · Johannes Berg
Quoted 3 lines · On Sun, 2007-06-24 at 09:57 +0100, [email protected] wrote:

plain text document attachment (mac80211-docs-radiotap-usage.patch) Try #14
- Documented Jiri Benc's injection encapsulation method

Hm, replied to the other (kill mgmt interface) thread without looking through other mails :-(

Quoted 5 lines

I still don't see the point since we've previously established that it won't help on other interfaces (qdiscs, ...); for monitor interfaces #13 is enough and much simpler.

I'd vote for applying #13.

Agreed.

Jiri

Signature · 2 lines
Jiri Benc
SUSE Labs
author
#4 lore raw

Re: [PATCH Try#14 1/4] mac80211: Monitor mode radiotap injection docs

Quoted 9 lines · Jiri Benc
Quoted 4 lines · Johannes Berg
Quoted 3 lines · On Sun, 2007-06-24 at 09:57 +0100, [email protected] wrote:

plain text document attachment (mac80211-docs-radiotap-usage.patch) Try #14
- Documented Jiri Benc's injection encapsulation method

Hm, replied to the other (kill mgmt interface) thread without looking through other mails :-(

Quoted 7 lines
Quoted 5 lines

I still don't see the point since we've previously established that it won't help on other interfaces (qdiscs, ...); for monitor interfaces #13 is enough and much simpler.

I'd vote for applying #13.

Agreed.

Great, well let's go with that.

-Andy

#5 lore raw

PATCH 2/4 cfg80211: Radiotap parser

In reply to [email protected]

Generic code to walk through the fields in a radiotap header, accounting for nasties like extended "field present" bitfields and alignment rules

Try #lucky13
- Integrated a patch from Michael Wu with (Thanks again Michael)
- whitespace errors
- an endian error
- a strict endian typing problem
- Johannes Berg's suggested use of get_unaligned() to protect unaligned defreferences of all multibyte radiotap stuff

Try #12 comments from Michael Wu
- Use 1<<IEEE80211_RADIOTAP_EXT then no need to add mask to radiotap hdr
- Revert Johannes' enum method
- break down padding action with temp var

Try #11
- parser returns enum retcode - Johannes Berg

Try #10 comments from Michael Wu
- kill some spaces between * and var/arg
- weed out cut-n-pasted #includes that aren't actually used
- kill vertical justification
- kill unneccessary parenthesis in some expressions
- sizeof() on dereferenced vars not types
- ulong pointer arithmetic! Good catch!

Try #9 (of the radiotap patchset) thanks to Johannes Berg's feedback
- Add docs to nano kernel docs
- Add docs to Documentation/networking/radiotap-headers.txt
- Fix typos

Try #2
- added sanity check to extended present bitmap u32 walking code - disallow possibility to walk past the end of the radiotap header length

Try #1
- Based on Johannes Berg's comments, broke out the radiotap parsing into its own file as part of cfg80211
- From same comments, added mask constant for b31 of arg presence bitfield to ieee80211_radiotap.h
- Fixed subtle but nasty bug with alignment: args in the radiotap area are aligned *relative to the start of the header* now. The header is not guaranteed to align to anything (it is randomly in an skb data area).

CC John Linville <[email protected]>
CC Johannes Berg <[email protected]>
CC Jiri Benc <[email protected]>

===================================================

---
 Documentation/networking/radiotap-headers.txt |   65 ++++++
 include/net/cfg80211.h                        |   38 +++
 net/wireless/Makefile                         |    2 
 net/wireless/radiotap.c                       |  257 ++++++++++++++++++++++++++
 4 files changed, 361 insertions(+), 1 deletion(-)
include/net/cfg80211.h +38 -0
Index: wireless-dev/include/net/cfg80211.h
===================================================================
@@ -75,6 +75,44 @@ struct key_params {
 	u32 cipher;
 };
 
+
+/* Radiotap header iteration
+ *   implemented in net/wireless/radiotap.c
+ *   docs in Documentation/networking/radiotap-headers.txt
+ */
+/**
+ * struct ieee80211_radiotap_iterator - tracks walk thru present radiotap args
+ * @rtheader: pointer to the radiotap header we are walking through
+ * @max_length: length of radiotap header in cpu byte ordering
+ * @this_arg_index: IEEE80211_RADIOTAP_... index of current arg
+ * @this_arg: pointer to current radiotap arg
+ * @arg_index: internal next argument index
+ * @arg: internal next argument pointer
+ * @next_bitmap: internal pointer to next present u32
+ * @bitmap_shifter: internal shifter for curr u32 bitmap, b0 set == arg present
+ */
+
+struct ieee80211_radiotap_iterator {
+	struct ieee80211_radiotap_header *rtheader;
+	int max_length;
+	int this_arg_index;
+	u8 *this_arg;
+
+	int arg_index;
+	u8 *arg;
+	__le32 *next_bitmap;
+	u32 bitmap_shifter;
+};
+
+extern int ieee80211_radiotap_iterator_init(
+   struct ieee80211_radiotap_iterator *iterator,
+   struct ieee80211_radiotap_header *radiotap_header,
+   int max_length);
+
+extern int ieee80211_radiotap_iterator_next(
+   struct ieee80211_radiotap_iterator *iterator);
+
+
 /* from net/wireless.h */
 struct wiphy;
 
net/wireless/Makefile +1 -1
Index: wireless-dev/net/wireless/Makefile
===================================================================
@@ -1,5 +1,5 @@
 obj-$(CONFIG_WIRELESS_EXT) += wext.o
 obj-$(CONFIG_CFG80211) += cfg80211.o
 
-cfg80211-y += core.o sysfs.o
+cfg80211-y += core.o sysfs.o radiotap.o
 cfg80211-$(CONFIG_NL80211) += nl80211.o
net/wireless/radiotap.c new file +257 -0

257 lines not on this page · raw message

Documentation/networking/radiotap-headers.txt +65 -0

69 lines not on this page · raw message

#6 lore raw

PATCH 3/4 --- include/linux/if_ether.h | 1 + 1 file changed, 1 insertion(+)

In reply to [email protected]
include/linux/if_ether.h +1 -0
Index: wireless-dev/include/linux/if_ether.h
===================================================================
@@ -98,6 +98,7 @@
 #define ETH_P_ECONET	0x0018		/* Acorn Econet			*/
 #define ETH_P_HDLC	0x0019		/* HDLC frames			*/
 #define ETH_P_ARCNET	0x001A		/* 1A for ArcNet :-)            */
+#define ETH_P_80211_RT	0x001B		/* Radiotap + 80211 encapsulation */
 
 /*
  *	This is an Ethernet frame header.
#7 lore raw

PATCH 4/4 mac80211: Monitor mode radiotap-based packet injection

In reply to [email protected]

Try #14
- Changed to Jiri Benc's injection encapsulation method

Try #Lucky13
- Integrated a patch from Michael Wu with (Thanks again Michael)
- whitespace errors
- an endian error
- a strict endian typing problem
- Johannes Berg's suggested use of get_unaligned() to protect unaligned defreferences of all multibyte radiotap stuff

Try #12 Comments from Michael Wu
- Revert enum retcode stuff
- Handle flags, checking if FCS marked as present and snipping it
- kill a blank line

Try #11
- Change parser loop code around to deal with enum retcodes

Try #10 Comments from Michael Wu
- __ieee80211_convert_radiotap_to_control_and_remove -> __ieee80211_parse_tx_radiotap
- death to vertical justification
- -ve to negative
- struct ieee80211_hw_mode should be called "mode" by convention

Try #9
- Normalize multiline comment style

Try #6
- Accounted for various comments from Johannes Berg
- Radiotap parsing is moved to cfg80211 as requested in a separate patch

Try #5
- De-indent last few indented comments

Try #4
- All from Michael Wu's feedback: further style heresies removed
- took account of radiotap arg alignment requirement. n-byte arg must be placed on n-byte boundary using padding where necessary

Try #3
- moved to Michael Wu's method of tracking if we came in on a monitor interface by using ifindex
- removed older proposed monitor interface tracking method and flags
- style fixes
- removed duped #include that is present in Michael Wu's patch already

Try #2
- took Michael Wu's advice about better tools and basing on wireless-dev
- took Luis Rodriguez's advice about coding style makeover
- took Pavel Roskin's advice about little-endian radiotap

CC John Linville <[email protected]>
CC Johannes Berg <[email protected]>
CC Jiri Benc <[email protected]>
---
 net/mac80211/ieee80211.c |  283 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 273 insertions(+), 10 deletions(-)
net/mac80211/ieee80211.c +273 -10
Index: wireless-dev/net/mac80211/ieee80211.c
===================================================================
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/bitmap.h>
 #include <net/cfg80211.h>
+#include <asm/unaligned.h>
 
 #include "ieee80211_common.h"
 #include "ieee80211_i.h"
@@ -1118,7 +1119,135 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
 }
 
 
-static void inline
+/*
+ * deal with packet injection down monitor interface
+ * with Radiotap Header -- only called for monitor mode interface
+ */
+
+static ieee80211_txrx_result
+__ieee80211_parse_tx_radiotap(
+	struct ieee80211_txrx_data *tx,
+	struct sk_buff *skb, struct ieee80211_tx_control *control)
+{
+	/*
+	 * this is the moment to interpret and discard the radiotap header that
+	 * must be at the start of the packet injected in Monitor mode
+	 *
+	 * Need to take some care with endian-ness, since radiotap
+	 * args are always little-endian
+	 */
+	struct ieee80211_radiotap_iterator iterator;
+	struct ieee80211_radiotap_header *rthdr =
+		(struct ieee80211_radiotap_header *) skb->data;
+	struct ieee80211_hw_mode *mode = tx->local->hw.conf.mode;
+	int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len);
+
+	/*
+	 * default control situation for all injected packets
+	 * FIXME: this does not suit all usage cases, expand to allow control
+	 */
+	control->retry_limit = 1; /* no retry */
+	control->key_idx = -1; /* no encryption key */
+	control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS |
+			    IEEE80211_TXCTL_USE_CTS_PROTECT);
+	control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT |
+			  IEEE80211_TXCTL_NO_ACK;
+	control->antenna_sel_tx = 0; /* default to default antenna */
+
+	/*
+	 * for every radiotap entry that is present
+	 * (ieee80211_radiotap_iterator_next returns -ENOENT when no more
+	 * entries present, or -EINVAL on error)
+	 */
+	while (!ret) {
+		int i, target_rate;
+
+		ret = ieee80211_radiotap_iterator_next(&iterator);
+
+		if (ret)
+			continue;
+
+		/* see if this argument is something we can use */
+		switch (iterator.this_arg_index) {
+		/*
+ 		 * You must take care when dereferencing iterator.this_arg
+ 		 * for multibyte types... the pointer is not aligned.  Use
+ 		 * get_unaligned((type *)iterator.this_arg) to dereference
+ 		 * iterator.this_arg for type "type" safely on all arches.
+		*/
+		case IEEE80211_RADIOTAP_RATE:
+			/*
+			 * radiotap rate u8 is in 500kbps units eg, 0x02=1Mbps
+			 * ieee80211 rate int is in 100kbps units eg, 0x0a=1Mbps
+			 */
+			target_rate = (*iterator.this_arg) * 5;
+			for (i = 0; i < mode->num_rates; i++) {
+				struct ieee80211_rate *r = &mode->rates[i];
+
+				if (r->rate > target_rate)
+					continue;
+
+				control->rate = r;
+
+				if (r->flags & IEEE80211_RATE_PREAMBLE2)
+					control->tx_rate = r->val2;
+				else
+					control->tx_rate = r->val;
+
+				/* end on exact match */
+				if (r->rate == target_rate)
+					i = mode->num_rates;
+			}
+			break;
+
+		case IEEE80211_RADIOTAP_ANTENNA:
+			/*
+			 * radiotap uses 0 for 1st ant, mac80211 is 1 for
+			 * 1st ant
+			 */
+			control->antenna_sel_tx = (*iterator.this_arg) + 1;
+			break;
+
+		case IEEE80211_RADIOTAP_DBM_TX_POWER:
+			control->power_level = *iterator.this_arg;
+			break;
+
+		case IEEE80211_RADIOTAP_FLAGS:
+			if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FCS) {
+				/*
+				 * this indicates that the skb we have been
+				 * handed has the 32-bit FCS CRC at the end...
+				 * we should react to that by snipping it off
+				 * because it will be recomputed and added
+				 * on transmission
+				 */
+				if (skb->len < (iterator.max_length + FCS_LEN))
+					return TXRX_DROP;
+
+				skb_trim(skb, skb->len - FCS_LEN);
+			}
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */
+		return TXRX_DROP;
+
+	/*
+	 * remove the radiotap header
+	 * iterator->max_length was sanity-checked against
+	 * skb->len by iterator init
+	 */
+	skb_pull(skb, iterator.max_length);
+
+	return TXRX_CONTINUE;
+}
+
+
+static ieee80211_txrx_result inline
 __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
 		       struct sk_buff *skb,
 		       struct net_device *dev,
@@ -1126,6 +1255,8 @@ __ieee80211_tx_prepare(struct ieee80211_
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+	ieee80211_txrx_result res = TXRX_CONTINUE;
+
 	int hdrlen;
 
 	memset(tx, 0, sizeof(*tx));
@@ -1135,7 +1266,38 @@ __ieee80211_tx_prepare(struct ieee80211_
 	tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 	tx->sta = sta_info_get(local, hdr->addr1);
 	tx->fc = le16_to_cpu(hdr->frame_control);
+
+	/*
+	 * set defaults for things that can be set by
+	 * injected radiotap headers
+	 */
 	control->power_level = local->hw.conf.power_level;
+	control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
+	if (local->sta_antenna_sel != STA_ANTENNA_SEL_AUTO && tx->sta)
+		control->antenna_sel_tx = tx->sta->antenna_sel_tx;
+
+	/*
+	 * if the skb came in as in encapsulated injection packet, process
+	 * and then remove the radiotap header
+	 */
+	if (skb->protocol == ETH_P_80211_RT) {
+
+		printk("__ieee80211_tx_prepare sees ETH_P_80211_RT\n");
+
+		if (__ieee80211_parse_tx_radiotap(tx, skb, control) ==
+								TXRX_DROP) {
+			printk("  drop\n");
+			return TXRX_DROP;
+		}
+		/*
+		 * we removed the radiotap header after this point,
+		 * we filled control with what we could use
+		 * set to the actual ieee header now
+		 */
+		hdr = (struct ieee80211_hdr *) skb->data;
+		res = TXRX_QUEUED; /* indication it was injected packet */
+	}
+
 	tx->u.tx.control = control;
 	tx->u.tx.unicast = !is_multicast_ether_addr(hdr->addr1);
 	if (is_multicast_ether_addr(hdr->addr1))
@@ -1152,9 +1314,6 @@ __ieee80211_tx_prepare(struct ieee80211_
 		control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
 		tx->sta->clear_dst_mask = 0;
 	}
-	control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
-	if (local->sta_antenna_sel != STA_ANTENNA_SEL_AUTO && tx->sta)
-		control->antenna_sel_tx = tx->sta->antenna_sel_tx;
 	hdrlen = ieee80211_get_hdrlen(tx->fc);
 	if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {
 		u8 *pos = &skb->data[hdrlen + sizeof(rfc1042_header)];
@@ -1162,6 +1321,7 @@ __ieee80211_tx_prepare(struct ieee80211_
 	}
 	control->flags |= IEEE80211_TXCTL_FIRST_FRAGMENT;
 
+	return res;
 }
 
 static int inline is_ieee80211_device(struct net_device *dev,
@@ -1274,7 +1434,7 @@ static int ieee80211_tx(struct net_devic
 	struct sta_info *sta;
 	ieee80211_tx_handler *handler;
 	struct ieee80211_txrx_data tx;
-	ieee80211_txrx_result res = TXRX_DROP;
+	ieee80211_txrx_result res = TXRX_DROP, res_prepare;
 	int ret, i;
 
 	WARN_ON(__ieee80211_queue_pending(local, control->queue));
@@ -1284,15 +1444,26 @@ static int ieee80211_tx(struct net_devic
 		return 0;
 	}
 
-	__ieee80211_tx_prepare(&tx, skb, dev, control);
+	res_prepare = __ieee80211_tx_prepare(&tx, skb, dev, control);
+
+	if (res_prepare == TXRX_DROP) {
+		dev_kfree_skb(skb);
+		return 0;
+	}
+
 	sta = tx.sta;
 	tx.u.tx.mgmt_interface = mgmt;
 	tx.u.tx.mode = local->hw.conf.mode;
 
-	for (handler = local->tx_handlers; *handler != NULL; handler++) {
-		res = (*handler)(&tx);
-		if (res != TXRX_CONTINUE)
-			break;
+	if (res_prepare == TXRX_QUEUED) { /* if it was an injected packet */
+		res = TXRX_CONTINUE;
+	} else {
+		for (handler = local->tx_handlers; *handler != NULL;
+		     handler++) {
+			res = (*handler)(&tx);
+			if (res != TXRX_CONTINUE)
+				break;
+		}
 	}
 
 	skb = tx.skb; /* handlers are allowed to change skb */
@@ -1493,6 +1664,76 @@ static int ieee80211_master_start_xmit(s
 	return ret;
 }
 
+/*
+ * snips off the injection encapsulation ethernet header when the packet
+ * has been identified as coming into ieee80211_subif_start_xmit
+ * having the ETH_P_80211_RT type
+ */
+static int
+ieee80211_subif_tx_rt_encap_remove(struct sk_buff *skb, struct net_device *dev,
+    struct ieee80211_sub_if_data *sdata, struct ieee80211_local *local)
+{
+	struct ieee80211_tx_packet_data *pkt_data;
+	struct ieee80211_radiotap_header *prthdr;
+	u16 len;
+
+	/*
+	 * snip off the encapsulating ethernet type header
+	 * caller ieee80211_subif_start_xmit confirmed we have at least
+	 * ETH_HLEN in the skb
+	 */
+	skb_pull(skb, ETH_HLEN);
+	prthdr = (struct ieee80211_radiotap_header *)skb->data;
+	/*
+	 * there must be a radiotap header at the
+	 * start in this case
+	 */
+	if (unlikely(skb->len < sizeof(*prthdr))) {
+		printk(KERN_DEBUG "%s: short skb (len=%d)\n",
+			dev->name, skb->len);
+		return -EINVAL;
+	}
+	/*
+	 * only version 0 is supported... must check here because
+	 * we are interested in the length inside in a moment
+	 */
+	if (unlikely(prthdr->it_version))
+		return -EINVAL;
+
+	skb->dev = local->mdev;
+	pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+	memset(pkt_data, 0, sizeof(*pkt_data));
+	/* needed because we set skb device to master */
+	pkt_data->ifindex = sdata->dev->ifindex;
+	pkt_data->mgmt_iface = 0;
+	pkt_data->do_not_encrypt = 1;
+	/*
+	 * fix up the skb pointers accounting for the radiotap
+	 * header still being in there.  We are being given
+	 * a precooked IEEE80211 header so no need for
+	 * normal processing
+	 */
+	len = le16_to_cpu(get_unaligned(&prthdr->it_len));
+	/*
+	 * detect possible insantity with the reported rt length
+	 * vs the actual skb length
+	 */
+	if (unlikely(skb->len < (sizeof(*prthdr) + len))) {
+		printk(KERN_DEBUG "%s: short skb (len=%d)\n",
+			dev->name, skb->len);
+		return -EINVAL;
+	}
+	skb_set_mac_header(skb, len);
+	skb_set_network_header(skb, len + sizeof(struct ieee80211_hdr));
+	skb_set_transport_header(skb, len + sizeof(struct ieee80211_hdr));
+	/*
+	 * mark the SKB as having had the encapsulation so we can recognize
+	 * that this is an injected packet with radiotap subsequently
+	 */
+	skb->protocol = ETH_P_80211_RT;
+
+	return 0;
+}
 
 /**
  * ieee80211_subif_start_xmit - netif start_xmit function for Ethernet-type
@@ -1537,6 +1778,28 @@ static int ieee80211_subif_start_xmit(st
 	/* convert Ethernet header to proper 802.11 header (based on
 	 * operation mode) */
 	ethertype = (skb->data[12] << 8) | skb->data[13];
+
+	/*
+	 * Case where an injected radiotap + 80211 packet is encapsulated
+	 * in a ETH_P_80211_RT frame
+	 */
+	if (ethertype == ETH_P_80211_RT) {
+		ret = 0; /* we should free the skb on fail */
+		/*
+		 * strip the encapsulating ethernet header and mark skb's
+		 * protocol as being ETH_P_80211_RT
+		 */
+		if (ieee80211_subif_tx_rt_encap_remove(skb, dev, sdata, local))
+			goto fail;
+		/*
+		 * pass the remaining radiotap header + 80211 header + payload
+		 * up to the next stage
+		 */
+		dev_queue_xmit(skb);
+
+		return 0;
+	}
+
 	/* TODO: handling for 802.1x authorized/unauthorized port */
 	fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;