diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
| commit | 806834f526784fbddd3795fe435b687897962be5 (patch) | |
| tree | e945c9f6987684b98ee1f7acb104a603624634df /drivers/net/wireless/libertas/tx.c | |
| parent | 4c1b5fa0d34e0e6a6a5ba54961ea11bb726db69c (diff) | |
| parent | a5b2db67139e991d9e9e19260989d0e66a03a2b2 (diff) | |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
| -rw-r--r-- | drivers/net/wireless/libertas/tx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 00d95f75bd89..77f1f9525b81 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c @@ -151,7 +151,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; - if (priv->monitormode != LBS_MONITOR_OFF) { + if (priv->monitormode) { /* Keep the skb to echo it back once Tx feedback is received from FW */ skb_orphan(skb); @@ -186,8 +186,7 @@ void lbs_send_tx_feedback(struct lbs_private *priv) int txfail; int try_count; - if (priv->monitormode == LBS_MONITOR_OFF || - priv->currenttxskb == NULL) + if (!priv->monitormode || priv->currenttxskb == NULL) return; radiotap_hdr = (struct tx_radiotap_hdr *)priv->currenttxskb->data; |