[lkml]   [2010]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the wireless tree with the wireless-current tree
    Hi John,

    Today's linux-next merge of the wireless tree got a conflict in
    drivers/net/wireless/iwlwifi/iwl-4965.c between commit
    be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
    tfds can be free for 4965") from the wireless-current tree and commit
    74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
    functions from iwlcore to iwlagn") from the wireless tree.

    I fixed it up (see below) and can carry the fix for a while.
    Stephen Rothwell

    diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
    index 3297fc7,1808c97..0000000
    --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
    @@@ -2046,15 -2047,17 +2047,15 @@@ static void iwl4965_rx_reply_tx(struct

    - freed = iwl_tx_queue_reclaim(priv, txq_id, index);
    + freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
    - if (qc && likely(sta_id != IWL_INVALID_STATION))
    - priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
    + iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

    if (priv->mac80211_registered &&
    (iwl_queue_space(&txq->q) > txq->q.low_mark))
    iwl_wake_queue(priv, txq_id);

    - iwl_txq_check_empty(priv, sta_id, tid, txq_id);
    - if (qc && likely(sta_id != IWL_INVALID_STATION))
    - iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
    ++ iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);

    if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
    IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2010-04-01 04:03    [W:0.019 / U:61.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site