Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a97bcfed96b563f56f55dbccee70e09bd2800414
Commit:     a97bcfed96b563f56f55dbccee70e09bd2800414
Parent:     121947c62ab049bfaeb8fadc9908834b5a99daf0
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 9 22:00:55 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:28 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/tx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/libertas/tx.c 
b/drivers/net/wireless/libertas/tx.c
index aefe524..c2881a9 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)
        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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to