Changeset 2529

Timestamp:

07/03/07 19:11:18 (2 years ago)

Author:

mentor

Message:

Fix the return value of ath_hardstart in case of a full internal queue. Furthermore, use the appropriate constants from netdevice.h.

Signed-off-by: Arnd Hannemann <hannemann@i4.informatik.rwth-aachen.de>

Files:

• trunk/ath/if_ath.c (modified) (9 diffs)

trunk/ath/if_ath.c

@@ -2488 +2488 @@
-        struct sk_buff *tskb;
-        int framecnt;
+        int requeue = 0;
-#ifdef ATH_SUPERG_FF
-        unsigned int pktlen;
@@ -2505 +2506 @@
-        }
-
-
-        STAILQ_INIT(&bf_head);
-
@@ -2512 +2512 @@
-                if (bf == NULL)
-                        goto hardstart_fail;
-
+
+
-        }
-
@@ -2544 +2545 @@
-        if (txq->axq_depth > TAIL_DROP_COUNT) {
-                sc->sc_stats.ast_tx_discard++;
+                /* queue is full, let the kernel backlog the skb */
+                requeue = 1;
-                goto hardstart_fail;
-        }
@@ -2595 +2598 @@
-                        ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
-
-0
+NETDEV_TX_OK
-                }
-        } else {
@@ -2643 +2646 @@
-
-                        goto ff_flush_done;
-
-
-                }
-                /*
@@ -2751 +2752 @@
-#endif
-
-0
+NETDEV_TX_OK
-
-hardstart_fail:
@@ -2768 +2769 @@
-        }
-
+        /* let the kernel requeue the skb (dont free it!) */
+        if (requeue)
+                return NETDEV_TX_BUSY;
+
-        /* free sk_buffs */
-        while (skb) {
@@ -2775 +2780 @@
-                skb = tskb;
-        }
-0;      /* NB: return !0 only in a ``hard error condition'' */
+NETDEV_TX_OK;   
-}
-#undef ATH_HARDSTART_GET_TX_BUF_WITH_LOCK