Please note: This project is no longer active. The website is kept online for historic purposes only.
If you´re looking for a Linux driver for your Atheros WLAN device, you should continue here .

Ticket #1368: ff_done.diff

File ff_done.diff, 1.2 kB (added by dyqith, 12 years ago)

Try to fix the ATH_TXQ_LOCK problems in ath_hardstart

  • ath/if_ath.c

    old new  
    25422542                goto hardstart_fail; 
    25432543        } 
    25442544 
    2545         /* NB: use this lock to protect an->an_ff_txbuf in athff_can_aggregate(
    2546          *    call too. 
     2545        /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq
     2546         *     in athff_can_aggregate() call too. 
    25472547         */ 
    25482548        ATH_TXQ_LOCK_IRQ(txq); 
    25492549        if (athff_can_aggregate(sc, eh, an, skb, vap->iv_fragthreshold, &ff_flush)) { 
     
    26002600                        TAILQ_REMOVE(&txq->axq_stageq, bf_ff, bf_stagelist); 
    26012601                        an->an_tx_ffbuf[skb->priority] = NULL; 
    26022602 
     2603 
     2604                        /* NB: ath_tx_start -> ath_tx_txqaddbuf uses ATH_TXQ_LOCK too */ 
     2605                        ATH_TXQ_UNLOCK_IRQ_EARLY(txq); 
     2606 
    26032607                        /* encap and xmit */ 
    26042608                        bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt); 
    26052609 
     
    26282632                                STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf_ff, bf_list); 
    26292633                                ATH_TXBUF_UNLOCK_IRQ(sc); 
    26302634                        } 
     2635 
     2636                        /* NB: Bypass the txq unlock at the end */ 
     2637                        goto ff_done_txq_unlock; 
    26312638                } 
    26322639                /* 
    26332640                 * XXX: out-of-order condition only occurs for AP mode and multicast. 
     
    26472654 
    26482655        ATH_TXQ_UNLOCK_IRQ(txq); 
    26492656 
     2657ff_done_txq_unlock: 
    26502658ff_bypass: 
    26512659 
    26522660#else /* ATH_SUPERG_FF */