From: David Woodhouse Date: Mon, 10 Dec 2007 03:00:55 +0000 (-0500) Subject: libertas: TX packet is radiotap iff it comes from rtap_dev X-Git-Tag: v2.6.25-rc1~1162^2~406 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a97bcfed96b563f56f55dbccee70e09bd2800414;p=~emulex%2Finfiniband.git 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index aefe52419ba..c2881a9907c 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 */