From 7b644bffb0fe33ecc40e7eaec0802b950b52dc19 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 9 Dec 2007 22:00:55 -0500 Subject: [PATCH] --- yaml --- r: 79142 b: refs/heads/master c: a97bcfed96b563f56f55dbccee70e09bd2800414 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d656d8d6edc2..337eb40c6c0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 121947c62ab049bfaeb8fadc9908834b5a99daf0 +refs/heads/master: a97bcfed96b563f56f55dbccee70e09bd2800414 diff --git a/trunk/drivers/net/wireless/libertas/tx.c b/trunk/drivers/net/wireless/libertas/tx.c index aefe52419baa..c2881a9907c0 100644 --- a/trunk/drivers/net/wireless/libertas/tx.c +++ b/trunk/drivers/net/wireless/libertas/tx.c @@ -105,7 +105,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) p802x_hdr = skb->data; pkt_len = skb->len; - if (priv->monitormode != LBS_MONITOR_OFF) { + if (dev == priv->rtap_net_dev) { struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data; /* set txpd fields from the radiotap header */