From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 12 Jun 2012 18:25:04 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0440507bbc44149e63bbfb9df730ba3820371904;p=linux-beck.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
---

0440507bbc44149e63bbfb9df730ba3820371904
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index b849528d48dc,1eabb834e32a..969f78f421df
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1351,10 -1317,10 +1317,10 @@@ static int iwl_trans_pcie_tx(struct iwl
  	iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
  
  	dma_sync_single_for_device(trans->dev, txcmd_phys, firstlen,
- 			DMA_BIDIRECTIONAL);
+ 				   DMA_BIDIRECTIONAL);
  
  	trace_iwlwifi_dev_tx(trans->dev,
 -			     &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
 +			     &txq->tfds[txq->q.write_ptr],
  			     sizeof(struct iwl_tfd),
  			     &dev_cmd->hdr, firstlen,
  			     skb->data + hdr_len, secondlen);