aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-09 22:00:55 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:28 -0500
commita97bcfed96b563f56f55dbccee70e09bd2800414 (patch)
tree52850cf542bad2e94d34a28e3a7ffe00c7cab0d8
parent121947c62ab049bfaeb8fadc9908834b5a99daf0 (diff)
libertas: TX packet is radiotap iff it comes from rtap_dev
Fix one of the barriers to simultaneous radiotap and normal operation -- stop misinterpreting the TX packets on the normal devices. We're also going to have to clone the incoming skbs and feed them into both devices, and there seem to be firmware problems with staying associated too. But this is a reasonable start... Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index aefe52419baa..c2881a9907c0 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -105,7 +105,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
105 p802x_hdr = skb->data; 105 p802x_hdr = skb->data;
106 pkt_len = skb->len; 106 pkt_len = skb->len;
107 107
108 if (priv->monitormode != LBS_MONITOR_OFF) { 108 if (dev == priv->rtap_net_dev) {
109 struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data; 109 struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data;
110 110
111 /* set txpd fields from the radiotap header */ 111 /* set txpd fields from the radiotap header */