[toolchain] fix uClibc v0.9.30 build on x86_64

[openwrt.git] / package / libertas / src / tx.c

diff --git a/package/libertas/src/tx.c b/package/libertas/src/tx.c
index 8a1a396..a4972fe 100644 (file)
--- a/package/libertas/src/tx.c
+++ b/package/libertas/src/tx.c
@@ -93,8 +93,8 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                netif_stop_queue(priv->mesh_dev);
 
        if (priv->tx_pending_len) {
                netif_stop_queue(priv->mesh_dev);
 
        if (priv->tx_pending_len) {

-               /* This can happen if packets come in on the mesh and eth 
-                  device simultaneously -- there's no mutual exclusion on 
+               /* This can happen if packets come in on the mesh and eth
+                  device simultaneously -- there's no mutual exclusion on

                   hard_start_xmit() calls between devices. */
                lbs_deb_tx("Packet on %s while busy\n", dev->name);
                ret = NETDEV_TX_BUSY;
                   hard_start_xmit() calls between devices. */
                lbs_deb_tx("Packet on %s while busy\n", dev->name);
                ret = NETDEV_TX_BUSY;


@@ -151,7 +151,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        dev->trans_start = jiffies;
 
 
        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);
                /* 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
  */
  *
  *  @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;
 {
        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;
 
                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);
 
        priv->currenttxskb->protocol = eth_type_trans(priv->currenttxskb,
                                                      priv->rtap_net_dev);