From: David S. Miller Date: Wed, 13 Jun 2012 04:59:18 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=43b03f1f6d6832d744918947d185a7aee89d1e0f;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller --- 43b03f1f6d6832d744918947d185a7aee89d1e0f diff --cc MAINTAINERS index c5fd905206e7,03660de94cf7..3075a2a29511 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4339,8 -4342,9 +4342,9 @@@ F: arch/m68k/hp300 MAC80211 M: Johannes Berg L: linux-wireless@vger.kernel.org -W: http://linuxwireless.org/ +W: http://wireless.kernel.org/ - T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h @@@ -4350,8 -4354,9 +4354,9 @@@ MAC80211 PID RATE CONTRO M: Stefano Brivio M: Mattias Nissler L: linux-wireless@vger.kernel.org -W: http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID +W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID - T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git + T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained F: net/mac80211/rc80211_pid* diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c index 969f78f421df,79c6b91417f9..7461a6a14338 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@@ -1054,17 -1058,11 +1054,23 @@@ static void iwl_tx_start(struct iwl_tra iwl_write_prph(trans, SCD_DRAM_BASE_ADDR, trans_pcie->scd_bc_tbls.dma >> 10); + for (i = 0; i < trans_pcie->n_q_to_fifo; i++) { + int fifo = trans_pcie->setup_q_to_fifo[i]; + + __iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION, + IWL_TID_NON_QOS, + SCD_FRAME_LIMIT, 0); + } + + /* Activate all Tx DMA/FIFO channels */ + iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7)); + + /* The chain extension of the SCD doesn't work well. This feature is + * enabled by default by the HW, so we need to disable it manually. + */ + iwl_write_prph(trans, SCD_CHAINEXT_EN, 0); + ++ /* Enable DMA channel */ for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++) iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),