diff options
| author | John Crispin <john@openwrt.org> | 2008-11-30 16:53:16 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2008-11-30 16:53:16 +0000 |
| commit | 10aa4d9e42a87b842af6eb855d4678d37937a656 (patch) | |
| tree | 70fa882f0879b17c6e06226b3a896ce2cb4266a6 /package/libertas/src/tx.c | |
| parent | 4e61cbbf5e849c008b6c1fbab68219163f7b22b3 (diff) | |
| download | upstream-10aa4d9e42a87b842af6eb855d4678d37937a656.tar.gz upstream-10aa4d9e42a87b842af6eb855d4678d37937a656.tar.bz2 upstream-10aa4d9e42a87b842af6eb855d4678d37937a656.zip | |
update libertas driver
SVN-Revision: 13447
Diffstat (limited to 'package/libertas/src/tx.c')
| -rw-r--r-- | package/libertas/src/tx.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/package/libertas/src/tx.c b/package/libertas/src/tx.c index 00d95f75bd..a4972fed29 100644 --- a/package/libertas/src/tx.c +++ b/package/libertas/src/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); @@ -179,32 +179,17 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * * @returns void */ -void lbs_send_tx_feedback(struct lbs_private *priv) +void lbs_send_tx_feedback(struct lbs_private *priv, u32 try_count) { struct tx_radiotap_hdr *radiotap_hdr; - u32 status = priv->eventcause; - 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; - txfail = (status >> 24); - -#if 0 - /* The version of roofnet that we've tested does not use this yet - * But it may be used in the future. - */ - if (txfail) - radiotap_hdr->flags &= IEEE80211_RADIOTAP_F_TX_FAIL; -#endif - try_count = (status >> 16) & 0xff; - radiotap_hdr->data_retries = (try_count) ? - (1 + priv->txretrycount - try_count) : 0; - + radiotap_hdr->data_retries = try_count ? + (1 + priv->txretrycount - try_count) : 0; priv->currenttxskb->protocol = eth_type_trans(priv->currenttxskb, priv->rtap_net_dev); |