Changeset 1706

Timestamp:

09/03/06 06:39:21 (2 years ago)

Author:

mentor

Message:

Set the MORE DATA bit correctly on all multicast packets that have been stored for transmission after a beacon.

Files:

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

trunk/ath/if_ath.c

@@ -3954 +3954 @@
-         *     beacons, then drain the cabq by dropping all the frames in
-         *     the cabq so that the current vaps cab traffic can be scheduled.
+         * XXX: Need to handle the last MORE_DATA bit here.
-         */
-        if (ncabq && (avp->av_boff.bo_tim[4] & 1) && sc->sc_cabq->axq_depth) {
@@ -3981 +3982 @@
-                 * Move everything from the vap's mcast queue 
-                 * to the hardware cab queue.
-                 * XXX MORE_DATA bit?
-                 */
-                ATH_TXQ_LOCK(&avp->av_mcastq);
@@ -3996 +3996 @@
-#endif
-                }
+
+                /* Set the MORE_DATA bit for each packet except the last one */
+                STAILQ_FOREACH(bfmcast, &avp->av_mcastq.axq_q, bf_list) {
+                        if (bfmcast != STAILQ_LAST(&avp->av_mcastq.axq_q, ath_buf, bf_list))
+                                ((struct ieee80211_frame *)bfmcast->bf_skb->data)->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
+                }
+
-                /* append the private vap mcast list to  the cabq */
-                ATH_TXQ_MOVE_MCASTQ(&avp->av_mcastq, cabq);